Commit graph

418 commits

Author SHA1 Message Date
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
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
12600fff3d Fixed villagers flapping their wings whilst in a boat (RenderPonyMob and RenderPonyBase can be merged some time in the future) 2018-06-02 19:52:25 +02:00
Sollace
cd84f64d37 Fixed snouts not following the snuzzles config option 2018-06-02 19:13:52 +02:00
Sollace
9e2983d6b9 Fixed mixin error 2018-06-02 18:22:14 +02:00
Sollace
0393daa0ba Fix merge conflicts 2018-06-02 18:05:33 +02:00
Sollace
bc65369964 Reorganise how settings work, and renderers change immediately when you toggle an option 2018-06-02 17:52:36 +02:00
Sollace
e56611c3fc Docs! 2018-06-02 17:50:42 +02:00
Sollace
23b2618f1e Fixed buttons triggering their actions twice on the Liteloader pane 2018-06-02 17:50:41 +02:00
Sollace
dabd9ecad0 Rewrite the settings gui and add it to the liteloader panel 2018-06-02 17:50: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
e13a5c326d Added "ponify guardians" to the cluster 2018-05-27 12:36:53 +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
1e73c5d2bf First person magic (#56)
* Unicorns now levitate their items in first person

* Move the levitating item renderer out of being a singleton and add handling for bows and other special actions
2018-05-26 17:37:50 -04:00
Sollace
a0648d3526 Rewrite strafing (again) (#55) 2018-05-25 21:55:13 -04: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
e812ca8de9 Fix some errors in the ForgeProxy docs 2018-05-06 13:39:26 +02:00
Sollace
22fe541760 Seems I was looking at the completely wrong method. Again, either one line of braces. Anything else is bad for readability and I won't stand for it. 2018-05-03 14:58:05 +02:00
Sollace
b5104d67fd Rewrite strafing to not use a mixin 2018-05-02 14:41:43 +02:00
Sollace
e8500ea31f I really hate these stupid package-info files... 2018-05-02 14:40:17 +02: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
a639afea59 Moved render logic out of the entity mixin even though it's actually entity logic. 2018-05-01 21:29:16 +02:00
Sollace
7e183e3247 Bleh 2018-05-01 19:43:39 +02:00
Sollace
2325bf162d metadata.getRace().getEfectiveRace(MineLittlePony.getConfig().getEffectivePonyLevel(ignorePony)); 2018-05-01 19:37:45 +02:00
Sollace
9f429415b5 Eclipse pls, I told you to use spaces 2018-05-01 19:37:45 +02:00
Sollace
1f68025252 Cleaned up MixinRenderManager and made KillJoy happy
This will be the last commit on master until I can get this PR merged
2018-05-01 12:40:18 +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
e0732a14d6 Arrows seem to work fine, so let's re-enable them 2018-04-30 17:24:07 +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
ab8ab99bd5 Fixed rendering issues where the skin upload renders with the wrong model 2018-04-30 11:48:35 +02:00
Sollace
51e5c9ddc5 Fixed unicorns not swinging their arms when their hands are empty 2018-04-30 10:31:14 +02:00
Sollace
3a8ac047b1 Moved it up one more. That looks better. 2018-04-30 09:00:15 +02:00
Sollace
4e4b83fb30 Moved IRenderManager.addPlayerSkin up one and put stuff with PlayerModels into one spot 2018-04-30 08:51:36 +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
b69c365a5d Let's cut this down a bit 2018-04-29 23:40:09 +02:00
Sollace
35e9ef750b Fixed leg outset being encorrect for normal width legs 2018-04-29 23:06:34 +02:00
Sollace
0f7605edc3 Can't always rely on Minecraft.getConnection. Mojang pls 2018-04-29 20:19:30 +02:00
Sollace
871f12c3e2 Ponies no longer float above beds when they're sleeping 2018-04-29 20:18:57 +02:00
Sollace
06c608acba Fixed Vex overlays not being aligned to its body 2018-04-29 18:07:44 +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
7060359f58 Shhh you saw nothing (items glow again) 2018-04-29 16:41:40 +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
9f705df9c5 Fixed horn glow rendering looking derped 2018-04-28 21:23:26 +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
e5a453abd0 Reformatting missed some tabs 2018-04-28 12:44:10 +02:00
Sollace
25a42908e9 Apparantly this is correct? 2018-04-28 12:35:22 +02:00
Sollace
9dd0c0dfb8 Copy the texture width/height with children 2018-04-28 12:29:26 +02:00
Sollace
da3f14c85b Killjoy reminded me you can use interfaces for this 2018-04-28 12:28:45 +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
b410b988a2 Try not to break horribly when encountering an unexpected profession (can't assume new ones won't be added later on / by mods). 2018-04-27 19:12:45 +02:00
Sollace
8118cff5b6 Now that I know where this delegates, let's be consistent. 2018-04-27 19:10:22 +02:00
Sollace
e14b601b9f Merge RenderPonyEvoker + RenderPonyIllusionIllager + RenderPonyVindicator = RenderPonyIllager 2018-04-27 19:08:23 +02:00
Sollace
235494cd6c Split the held item renderer up into a magical and non-magical variant since they not neccessarily neet to be together 2018-04-27 19:06:22 +02:00
Sollace
b00b2745e1 Rename 'translateToHand' to better reflect what it does 2018-04-27 17:55:30 +02:00
Sollace
13ba3379c9 Use generics 2018-04-27 17:50:13 +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
7d8e971f03 Rename BasePonyRenderer -> AbstractPonyRenderer 2018-04-27 09:47:23 +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
16eed1e568 More codestyle 2018-04-26 22:30:17 +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
2ef344d9d3 Debug 2018-04-26 17:20:22 +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
75cb0eb6fc Rewrite the plane renderer/horn glow renderer to be more sensible 2018-04-26 16:00:01 +02:00
Sollace
d6c5e2bd0b Reimplement Daring Doo (STEVE) / Night Guard (ALEX) 2018-04-26 15:56:36 +02:00
Sollace
3dbedc3a5b This is why you test things, folks 2018-04-26 15:54:27 +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
5da88c8551 Wave 3, simplify trigger pixel handling 2018-04-25 13:00:18 +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