PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-27 06:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity
593 commits 33 branches 183 tags 24 MiB
Commit graph

340 commits

Author SHA1 Message Date
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
Sollace
8895d52fe1 Fixed various bugs with the new renderer / added a flying-strafing animation 2018-04-24 21:25:30 +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
Sollace
694db391bb Giants are now ponies 2018-04-12 16:21:19 +02:00
Sollace
e93c4784ee Build/silence warnings 2018-04-10 14:17:54 +02:00
Matthew Messinger
ae005e3323 Fix freezes for good. This also properly fixes network race issues. 2018-01-03 00:29:32 -05:00
Matthew Messinger
ca9743e377 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-01-02 00:19:28 -05:00
Matthew Messinger
18980c2ca2 First touches on multiple skin server support. 2018-01-02 00:18:50 -05:00
The_WeatherPony
fa7e4e6b60 Added Additional Races (#39) 
Added Reformed Changeling, Griffin, and Hippogriff pony races for addon mods.
 2017-11-27 23:28:48 -05:00
Matthew Messinger
486f787db3 Try not changing the skin server. Might improve skin loading. 2017-08-08 16:49:05 -04:00
Matthew Messinger
6e1689cc66 Update to 1.12.1 2017-08-08 16:33:33 -04:00
Matthew Messinger
93f4418a83 Add @reason tag to getEntityTexture overwrite javadoc 2017-07-29 00:03:18 -04:00
Matthew Messinger
4fe2035f81 Update for mixins 0.7. Fixes #35 2017-07-28 14:25:26 -04:00
Matthew Messinger
e5c0cc1609 Version bump 2017-06-22 00:35:29 -04:00
Matthew Messinger
192ed73809 Fix skin menu not showing ponies 2017-06-16 04:07:07 -04:00
Matthew Messinger
4950ba2161 Add toString method to Pony classes. 2017-06-16 03:58:44 -04:00
Matthew Messinger
29f2f5ee58 Fix class cast exceptions 
* elytras in skins menu
* zombie villagers
 2017-06-16 02:14:50 -04:00
Matthew Messinger
62e77acc38 Make Ponies and metadata immutable 2017-06-16 02:13:24 -04:00
Matthew Messinger
05483e1961 Make LayerEntityOnPonyShoulder include more entities 
Includes a method for getting a possible forge layer later.
 2017-06-16 02:09:49 -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
Matthew Messinger
3d818cd9d2 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2017-03-28 02:08:01 -04:00
Matthew Messinger
ba5642b310 Fix modded armors. 
Bug 1: forge postinit wasn't being called. Probably issue with event stub. Got rid of it to avoid the hassle.
Bug 2: ForgeHooksClient stub had bad signatures.
 2017-03-28 02:03:51 -04:00
Venaf
59b39f1080 Fix for extended wing position relative to body (#27) 2017-02-14 15:12:05 -05:00
Matthew Messinger
a1cb565275 Add travis config 
Also another itemstack == null
 2017-02-13 23:29:04 -05:00
Matthew Messinger
e016f420a7 Fix block heads for humans and add support for rendering items on the head. 2016-12-29 03:09:21 -05:00
Matthew Messinger
d68b335a62 override transform in humanplayer instead of testing instanceof. 2016-12-29 03:07:43 -05:00
Matthew Messinger
f5c2fe7045 Fix capes showing while elytra is worn 2016-12-29 03:06:25 -05:00
Matthew Messinger
e87c550f2b Use an etag for caching instead of md5. 
Release for 1.11.2
 2016-12-27 18:56:50 -05:00
Matthew Messinger
d5e766aaef Mobs can now wear elytras. 2016-12-26 21:15:25 -05:00
Matthew Messinger
6c0542ff89 Fix rendering issues with elytra flight 2016-12-26 20:58:21 -05:00
Matthew Messinger
80516f9068 Fix head being wrong while riding after sneaking 2016-12-26 17:38:32 -05:00
Matthew Messinger
15eccc5b99 Search the resource packs for a human texture with higher priority. 2016-12-21 04:46:16 -05:00
Matthew Messinger
886b12f157 Fix armors for non-pony textures. 2016-12-21 03:22:15 -05:00
Matthew Messinger
8971183121 Add support for uploading elytras. 2016-12-21 01:20:02 -05:00
Matthew Messinger
e87717387e Fix log message in PonyManager 2016-12-20 05:29:12 -05:00
Matthew Messinger
3b5b4bf011 Rename PonyArmors to be more obvious that it wraps ForgeHooks. 2016-12-20 05:28:56 -05:00
Matthew Messinger
f626345e8c Fix #16 by using a mixin on the item renderer instead of trying to recreate it myself. 2016-12-20 05:19:57 -05:00
Matthew Messinger
0cfe8fdee7 sync the armor better. 
This also fixes pegasus wings while riding.
 2016-12-04 02:19:37 -05:00
Matthew Messinger
0c0a42be11 Fix horns 2016-12-02 11:00:47 -05:00
Matthew Messinger
e411f6680d Make changing mob ponifications not need a restart. 2016-12-01 02:24:21 -05:00
Matthew Messinger
9e951f5aa7 Add the vex textures and add the illagers to the options. 2016-12-01 02:21:35 -05:00
Matthew Messinger
e9f04db833 Remove IPonyPart in favor of just a ModelBase. 2016-11-25 00:55:24 -05:00
Matthew Messinger
ef0f069e34 Code cleanup. 2016-11-25 00:37:49 -05:00
Matthew Messinger
b972fda9af Remove remote player skin metadata XP 
Also use java 8.
 2016-11-24 02:26:02 -05:00
Matthew Messinger
17ee345c11 Add the vindicator and evoker ponies 2016-11-24 02:03:40 -05:00
Matthew Messinger
8dfac7be08 Fix itemstack null checks 2016-11-22 16:20:23 -05:00
Matthew Messinger
9c7b6cd621 Simplify models a bit (TODO) 2016-11-22 16:19:18 -05:00
Matthew Messinger
945996cfa4 Update mappings 2016-11-22 16:13:24 -05:00
Matthew Messinger
9fd9a1b7ec Add breezies as the vex. 2016-11-17 01:01:38 -05:00
Matthew Messinger
38ccaf8e2d Change package 2016-11-17 00:03:35 -05:00
Matthew Messinger
2f01397d5e Change package 2015-11-17 00:09:04 -05:00
Matthew Messinger
0734ac963d Update to fg2 2015-10-06 18:42:46 -04:00
Matthew Messinger
667ab41d24 Some more cleanup. 2015-09-01 22:18:45 -04:00
Matthew Messinger
3f1e6a84f4 Fix human arm when sneaking 2015-08-17 02:20:31 -04:00
Matthew Messinger
e844b6105c Add translations for pony level 2015-08-17 01:54:56 -04:00
Matthew Messinger
50b0b668c7 Fix arm swinging with human's 2015-08-17 01:51:02 -04:00
Matthew Messinger
5895579412 Fix cape and arm texture. 2015-08-14 23:32:22 -04:00
Matthew Messinger
cfb94ae950 Brush pony 2015-08-14 23:25:40 -04:00
Matthew Messinger
3405dc2843 Fix unicorn nametags being black when an item is held. 
Removed some code, reimplement sometime.
 2015-08-13 00:49:28 -04:00
Matthew Messinger
48fce4e3b1 Fix guiskins constantly updating 2015-08-12 22:41:51 -04:00
Matthew Messinger
f1048026b3 Add translations, fix some rendering in guiskins and make it modular 2015-08-12 20:03:54 -04:00
Matthew Messinger
a49bae5b3b add some cape support, fully move item rendering into layers 2015-08-12 18:22:21 -04:00
Matthew Messinger
72e45ad08b Remove 32 version of human 2015-08-12 17:42:21 -04:00
Matthew Messinger
07246e2d16 Fix java 6. 2015-08-12 17:40:52 -04:00
Matthew Messinger
963a5e5a73 Fix flight and skins' bimap crash 2015-08-11 14:31:03 -04:00
Matthew Messinger
1dc6f0a99b Add skin drop 2015-08-11 14:30:38 -04:00
Matthew Messinger
929bc78b32 Undo player capabilities isFlying check for flight 2015-08-02 01:19:50 -04:00
Matthew Messinger
09217d136b Fix left leg 2015-08-02 00:19:14 -04:00
Matthew Messinger
40e5044b83 Fix armor 2015-08-02 00:07:38 -04:00
Matthew Messinger
3316f7b695 init 2015-08-01 18:36:33 -04:00