Commit graph

851 commits

Author SHA1 Message Date
Sollace
13282898db Add an interface method for getting an IPony from an already existing resource 2018-10-20 23:18:20 +02:00
Sollace
5a3ccbee58 Fixed first primary feather on spread pegasus wings being too short, resulting in a minor texturing issue seen when sneaking and sometimes whilst flying 2018-10-20 20:48:24 +02:00
Sollace
e9bc043ee6 Fixed legs on foals being _slightly_ too low causing them to be cut off on the skins gui 2018-10-20 20:36:36 +02:00
Sollace
fc69d2eedc Fixed saddlebags sometimes inheriting the wrong texture 2018-10-20 20:08:57 +02:00
Sollace
f66f78693f Rename LARGE -> BULKY and added a LANKY body type (used for Fleur) 2018-10-20 19:09:58 +02:00
Sollace
699136e809 Translation strings 2018-10-20 17:05:18 +02:00
Sollace
21ac013034 Add support for more than two states, and added a riding pose 2018-10-20 16:57:49 +02:00
Sollace
1af726c06a The skins gui will now let you see what your character looks like when sleeping 2018-10-20 16:03:53 +02:00
Sollace
4e674377db Fixed elytras not appearing in the correct location on seaponies(?) 2018-10-20 15:50:47 +02:00
Sollace
389fb1857e Fixed clash between snuzzles and the pony's hair layer 2018-10-20 14:12:12 +02:00
Sollace
1676c237e8 Some minor tidying up 2018-10-20 13:49:49 +02:00
Sollace
8d0c0a629e Fixed client drifting when rappidly toggling the GLWindow 2018-10-20 12:39:34 +02:00
Sollace
6feb20a331 Fixed an off-by-one when turning the GLWindow on 2018-10-20 12:23:28 +02:00
Sollace
7e78804157 fixed rapidly toggling the GLWindow causes the client to slide up and off the screen 2018-10-20 12:21:53 +02:00
Sollace
bba9a36996 Fixed delay/thread locking when setting the file drop target 2018-10-20 12:19:56 +02:00
Sollace
047fb49ac1 Fixed wearables not appearing on the skin preview 2018-10-19 15:38:54 +02:00
Sollace
87ca00aff9 Removed unused textures 2018-10-17 10:07:15 +02:00
Sollace
485de98c69 Change bat pony's ears (again) 2018-10-17 10:06:20 +02:00
Sollace
a859ea5172 Change batpony race pixels to #eeeeee instead of #dddddd. Closes #99 2018-10-17 09:07:07 +02:00
Sollace
34071a46c6 Fill in various missing documentation 2018-10-12 18:09:40 +02:00
Sollace
da5c985148 Decouple armour from the rest of the models system 2018-10-12 18:01:23 +02:00
Sollace
4aaadd1716 Use mojang's utility method instead of our own 2018-10-12 17:57:21 +02:00
Sollace
12ebe36662 Use the mojang utility instead 2018-10-12 15:09:43 +02:00
Sollace
9b0fdea7b8 Can't forget the right control key! 2018-10-12 14:52:08 +02:00
Sollace
7a1b77ccdf Added a ctrl+toggle for the jumping and sneaking actions on the skins gui 2018-10-12 13:39:36 +02:00
Sollace
323db09017 Added a Sweet Apple Acres panorama 2018-10-12 10:24:24 +02:00
Sollace
f6f981ecab Move the panoramas to the correct domain name 2018-10-12 09:51:15 +02:00
Sollace
192a34745e Fixed some z-fighting due to ponies' legs not all being at the same level 2018-10-11 16:41:13 +02:00
Matthew Messinger
882d1c5c7c Changing pony level is now instant. 2018-10-06 13:43:56 -04:00
Sollace
c6be9e5088 Add a debug key for reloading models 2018-10-02 00:04:27 +02:00
Sollace
fb78e806ea Don't render gear on invisible entities (however hilarious that was) 2018-10-01 20:11:00 +02:00
Sollace
1b3e160c3e Seprate the strafing code to its own class so it can be used outside of Minelp 2018-10-01 20:10:32 +02:00
Sollace
b5e0df7297 Adjust the design of bay pony ears based on feedback 2018-09-27 19:06:52 +02:00
Sollace
8d49b88e86 Only show the mojang api error message for mojang-related api errors 2018-09-23 23:12:22 +02:00
Sollace
227b571e95 Fix incompatability with VanillaFix 2018-09-23 11:37:33 +02:00
Sollace
8c21872bc3 Minor changes to make Vertex more useful to other mods 2018-09-23 11:37:33 +02:00
Sollace
0624da539d Integrate with the vanilla minecraft's bounding box debugger 2018-09-20 14:57:24 +02:00
Sollace
5e56f5101f Include players in the debug box rendering and frustrum checks 2018-09-20 14:56:50 +02:00
Sollace
2d68ff9ae9 Add missing translation string 2018-09-20 14:55:56 +02:00
Sollace
35a5be96ab Add hitbox calculation and custom frustrum checking for mobs 2018-09-20 14:33:15 +02:00
Sollace
169ac3d3b9 Apply rider position on a per-size basis and recursively translate riders higher up the stack 2018-09-20 11:33:27 +02:00
Sollace
46c4244b7e Adjust ponies riding posture to be less propane 2018-09-19 23:23:06 +02:00
Sollace
ff57ec8e40 Allow for mounted ponies to translate riding ponies onto their mount's backs, and apply postures to them 2018-09-19 19:43:23 +02:00
Sollace
cd27adb14e Fixed seaponies messing with transparency effects 2018-09-18 21:05:34 +02:00
Sollace
0226743f31 Rework folded bat wings slightly 2018-09-16 19:23:54 +02:00
Sollace
dc34d9ca6f Fixed bone placement and z-fighting on extended bat wings 2018-09-16 19:23:29 +02:00
Sollace
cbaeb9aaca add a hat stack 2018-09-16 16:06:56 +02:00
Sollace
891df59dfc Fixed bat wings not accurately mirroring each other 2018-09-16 16:05:24 +02:00
Sollace
ec1ef8ed6b Remove stetson lag 2018-09-10 19:37:58 +02:00
Sollace
b1a8627e9a De-debugging! So it that just like... bugging? 2018-09-10 17:27:31 +02:00
Sollace
0a171b6a56 Add stetsons 2018-09-10 15:40:56 +02:00
Sollace
f25c269360 Fixed zebra neck/head placement 2018-09-10 15:40:06 +02:00
Sollace
0f8209c06b It fixed itself? 2018-09-09 20:20:36 +02:00
Sollace
ea5ec9fdbe Missed this. 2018-09-09 19:49:26 +02:00
Sollace
c120207b2f Fix z-fighting on pony heads 2018-09-09 19:43:54 +02:00
Sollace
a919c76638 Separate wearables from their parent models 2018-09-09 19:40:34 +02:00
Matthew Messinger
810fc938a4 Fix stacktrace spam when profile id is null (hypixel) 2018-09-07 20:43:58 -04:00
Sollace
2fc4dcae90 Didn't mean to commit that 2018-09-07 21:20:35 +02:00
Sollace
fa7417f87b Added missing @Override annotations 2018-09-07 21:16:07 +02:00
Sollace
c57628a5bd Notice deprecation 2018-09-07 20:25:43 +02:00
Sollace
a4f53b59fa Removed the clear cache button. (no longer needed) 2018-09-07 20:22:51 +02:00
Sollace
0d75285808 Abort mission, abort mission! Expanded the wrong one. 2018-09-07 20:18:44 +02:00
Sollace
1654a26ecd E.X.P.A.N.D ARMOUR 2018-09-07 20:13:36 +02:00
Sollace
e296d87376 Add a bytes() method for MoreHttpResponses 2018-09-07 19:50:44 +02:00
Sollace
0f454b753c Ignore transparent colours when reading trigger pixels 2018-09-07 13:12:15 +02:00
Sollace
f4a3d93d23 No deleted. None 2018-09-06 16:25:04 +02:00
Sollace
283b7b56c7 Zombie villagers neeed this too 2018-09-06 15:39:32 +02:00
Sollace
fb013ea190 /simplify! 2018-09-06 15:09:56 +02:00
Sollace
10eda59bed Handle the futures stuff in one place 2018-09-06 14:12:28 +02:00
Sollace
dec6ad249f Re-organise package structure 2018-09-06 13:44:41 +02:00
Matthew Messinger
898f5c9ff9 Properly schedule updating the skin 2018-09-05 21:08:08 -04:00
Sollace
d78bd02d7b Revert: Zombies should still have a race pixel for their skulls 2018-09-05 17:09:26 +02:00
Sollace
d9ef32cc3c Let the models define their heights 2018-09-05 13:56:07 +02:00
Sollace
c74f05873e Adjust nameplate positioning on ponies. 2018-09-05 11:33:48 +02:00
Sollace
ac3a7c7668 Document flipFace() behaviour 2018-09-05 10:46:19 +02:00
Sollace
987e24d3a5 Rename plane renderer methods to be more in line with PonyRenderer 2018-09-05 10:17:22 +02:00
Sollace
d94e0953a7 Rearrange rendering packages to make them distinct from entity renderers 2018-09-05 10:12:38 +02:00
Matthew Messinger
d8913ed245 Extract nullable stream to new util class. 2018-09-04 19:21:58 -04:00
Matthew Messinger
d664cabb1a Remove Flow. It could've just been a single method. 2018-09-04 19:09:24 -04:00
Matthew Messinger
5851b1b46f Don't clear the skins when reloading the textures.
All that really needs to be done is reparse.
2018-09-04 19:08:04 -04:00
Sollace
b8cc905868 Merge "Split up the skinclear stream with some methods" 2018-09-05 00:59:39 +02:00
Matthew Messinger
5d72c4f0b4 Fix parseSkin race condition (final2) 2018-09-04 18:51:07 -04:00
Matthew Messinger
953f17828c Split up the skinclear stream with some methods 2018-09-04 18:50:12 -04:00
Sollace
005f5c0f45 Try to handle unknown villager professions. If this works correctly skins not present should become the generic villager pony 2018-09-04 23:58:15 +02:00
Sollace
585912cdfa Random whitespace at the end of a file 2018-09-04 23:54:31 +02:00
Sollace
2c4a03d74b For god's sake space your code out. I can't stand these cramped conditions 2018-09-04 22:49:40 +02:00
Matthew Messinger
a308e0ce96 Improve the stream to reload skins.
Hopefully it's more readable this time.
2018-09-03 16:31:28 -04:00
Matthew Messinger
d84a2051c8 Make the texture null loop more safe.
If the texture isn't there after 1 second, it probably won't be.
2018-09-03 16:25:24 -04:00
Matthew Messinger
8d2caccd01 Move some more classes to util 2018-09-03 15:56:56 -04:00
Matthew Messinger
2bb9e9b61a Fix issues related to skin loading.
Turns out, the anonymous classes were having trouble being deserialized.
2018-09-03 15:56:04 -04:00
Matthew Messinger
d82af57b3c Revert "The result shouldn't be null, and if it is null you REALLY SHOULDN'T LOOP ON IT INDEFINITELY"
This reverts commit 5ab8126
2018-09-03 15:52:35 -04:00
Matthew Messinger
e8217aa9c0 Revert "Revert "Fix legacy skin changing issue. The ETag is now included in the hash.""
This reverts commit 74c1e6f
2018-09-03 15:52:14 -04:00
Sollace
5ab8126b70 The result shouldn't be null, and if it is null you REALLY SHOULDN'T LOOP ON IT INDEFINITELY 2018-09-03 19:24:53 +02:00
Matthew Messinger
9956824861 No 2018-09-03 19:23:33 +02:00
Sollace
db4d9132e5 This class exists 2018-09-03 18:47:26 +02:00
Sollace
e03343b8ae You don't need to do this
# Conflicts:
#	src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
2018-09-03 18:46:14 +02:00
Sollace
74c1e6ffe1 Revert "Fix legacy skin changing issue. The ETag is now included in the hash."
This reverts commit 0b30c127c4.
2018-09-03 18:44:41 +02:00
Matthew Messinger
e6b6a61176 Fix race issue related to skin parsing. 2018-09-03 11:52:51 -04:00
Matthew Messinger
aa8ba2b3a6 Legacy doesn't support metadata. 2018-08-31 21:11:43 -04:00
Matthew Messinger
0b30c127c4 Fix legacy skin changing issue. The ETag is now included in the hash. 2018-08-31 20:21:10 -04:00
Sollace
ae45ebf3ca Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-31 11:45:39 +02:00
Sollace
14edc9086f Update this description 2018-08-31 11:45:09 +02:00
Matthew Messinger
fb20785d55 Fix NPE and clean up cache clear stream. 2018-08-30 18:19:46 -04:00
Sollace
d9f3cd5202 Revert show accurate scaling 2018-08-30 18:42:27 +02:00
Sollace
c622eeb2c1 Fixed steve pony heads having deadmou5 ears 2018-08-30 18:42:12 +02:00
Sollace
c2ac9cbbfa Use an interface for Pony instead of the class 2018-08-30 16:12:21 +02:00
Sollace
0debe17afe Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-30 13:30:46 +02:00
Sollace
402a394edc Fixed fps magic still running when at PonyLevel.HUMANS 2018-08-30 13:30:23 +02:00
Matthew Messinger
031d1ddd33 Fix model updating on NPCs that are not in the player list. 2018-08-29 23:03:50 -04:00
Matthew Messinger
f04d67caba Forge doesn't like notch names and neither do I. 2018-08-29 20:03:42 -04:00
Matthew Messinger
4346ccda37 Fix noskins 2018-08-27 19:22:34 -04:00
Sollace
e4a4de75b0 PonyDataSerialzier -> PonyDataSerialiser 2018-08-27 17:04:16 +02:00
Sollace
753e5e5155 Batponies don't wear saddlebags. They're too cool for that. 2018-08-27 16:00:12 +02:00
Sollace
abfb6ed9d7 Adjust texture mapping for bat wings 2018-08-27 15:58:09 +02:00
Sollace
e69876f0c7 Yet more warnings 2018-08-27 15:39:48 +02:00
Sollace
e1cfe8aa68 Unused variable 2018-08-27 15:37:52 +02:00
Matthew Messinger
1dc22f4ed4 Fix console spam when server sends a broken texture profile. 2018-08-26 18:31:02 -04:00
Matthew Messinger
91f741fa08 Fix PonyLevel.PONIES not working correctly. 2018-08-26 18:30:04 -04:00
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
dfcae69ab7 Fix warnings when reloading vanilla client skin. 2018-08-26 15:31:46 -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
8b779f57b2 Fixup mixin warnings 2018-08-25 22:54:06 -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
75b6c21b56 Don't do this. The line breaks mess with logging 2018-08-26 03:39:59 +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
ca48785add Clear all skins and actually re-load them when clearing the cache. 2018-08-24 23:35:18 -04:00
Matthew Messinger
c10c61b73b Don't know how this didn't get committed. 2018-08-24 21:58:35 -04: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
Matthew Messinger
72324feaf3 Fix file lock issues with the skin cache 2018-08-24 21:38:29 -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
9f42564c7e Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-23 15:36:38 +02:00
Sollace
a70925b57f Remove 'unused' blocks from the enderstallion texture 2018-08-23 15:36:17 +02:00
­Sollace
dccd41a804
Merge pull request #94 from PolyacovYury/patch-1
Yet another ru_ru update
2018-08-23 15:08:21 +02:00
Sollace
dc05d1baad Reword the skin save dialog as an actual saving dialogue 2018-08-23 15:07:33 +02:00
Matthew Messinger
58b0fd2630 Speed up loading of save dialog.
Pick save location, then download.
Also removes the callback because the button is updated in updateScreen
2018-08-22 20:11:17 -04:00
Matthew Messinger
6ef13d9e9a Make DummyWorld singleton. 2018-08-22 20:11:16 -04:00
Sollace
0ef8f810d7 Properly detect when a server's texture is in use 2018-08-23 01:35:39 +02:00
Sollace
68fcde4c2c Move cache busting to legacy server itself 2018-08-23 01:26:50 +02:00
Sollace
ee00330c83 Latter check is always true :/ 2018-08-23 01:13:33 +02:00
Sollace
fef22c8223 .equals 2018-08-23 01:13:08 +02:00
Sollace
b46c082ae3 Only offer a save dialog if the response was ok 2018-08-23 00:49:58 +02:00