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

850 commits

Author SHA1 Message Date
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
Sollace
f90814a730 Bust the cache. Always bust the cache. Serious I am sick of this cache. 2018-08-23 00:45:53 +02:00
Sollace
ee61b56ceb Only enable the clear/download buttons when there is something to clear/download 2018-08-23 00:42:54 +02:00
Sollace
94cdda95ea Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-23 00:03:50 +02:00
Sollace
804a25c255 Add batpony race 2018-08-22 23:35:40 +02:00
PolyacovYury
bb2b7b935b
Yet another ru_ru update 
Terribly sorry for spam. Noticed these only when IDEA's MCDev plugin shouted at me..
 2018-08-22 23:57:01 +03:00
PolyacovYury
dbecf63e75 ru_ru.lang: too long text for that tiny button (#93) 
Also removed redundand lines that were moved to MineLP's lang.
 2018-08-22 16:26:44 -04: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
6648655830 Fixed legacy skin servers not running asynchronously 2018-08-22 16:34:49 +02:00
Sollace
67e756f6dd Reload the remote after doing an upload/clear 2018-08-22 16:25:36 +02:00
Sollace
a4f93686df Fixed completable future not completable futuring 2018-08-22 16:12:35 +02:00
Sollace
3cc26b7cd1 Fixed fetching skin message never being cleared 2018-08-22 15:45:18 +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
488523670f Fixed gl error when load a skin from the server 2018-08-22 15:00:21 +02:00
Sollace
57688aab0d Fixed steve model not sneaking correctly 2018-08-22 15:00:00 +02:00
Sollace
60fbd430b3 Update all the buttons together 2018-08-22 14:59: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
fb767c698d
Merge pull request #91 from PolyacovYury/patch-1 
Update ru_ru.lang
 2018-08-22 01:07:00 +02:00
Sollace
3b27044f6c Translate the status message from the uploader 2018-08-22 01:05:13 +02:00
PolyacovYury
159782df69
Update ru_ru.lang 
This was kinda unexpected. Had to pull out my A-game at 2 A.M...
 2018-08-22 01:57:38 +03:00
Sollace
baa5982889 By the magic of trignometry, let them be.... really dang creepy. 2018-08-22 00:10:44 +02:00
Sollace
9c10efe6ec Don't forget to clear the online status! That was almost a very minor bug 2018-08-21 23:25:35 +02:00
Sollace
d9e9d6ddec Update lang files (sort of) 2018-08-21 21:22:43 +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
72a676b4bb Fix lighting errors on the skins gui 2018-08-20 20:51:34 +02:00
Sollace
f4395e286a Sssecrets 2018-08-20 20:51:24 +02:00
Sollace
b84a38f465 Now I'm calling it 2018-08-20 14:59:33 +02:00
Sollace
ed44f0b4be Remove deprecated code 2.0 2018-08-20 14:45:08 +02:00
Sollace
bb39a312c6 Added a button to download your skin 2018-08-20 14:19:42 +02:00
Sollace
8ef6c30a6d Revert: Remove deprecated code 2018-08-20 14:18:50 +02:00
Sollace
940223dcf0 Fix typo 2018-08-20 14:16:33 +02:00
Sollace
f7debac354 Fixed a horrible mistake 2018-08-20 13:49:06 +02:00
Sollace
869f4b6b5f Don't skip if/when deleting assets folders fails 2018-08-20 12:51:11 +02:00
Sollace
304f521e51 Simplify callback handling 2018-08-20 12:46:45 +02:00
Sollace
e26e21b160 Removed baby witches. Killjoy 2018-08-20 10:38:31 +02:00
Sollace
993078ec40 Remove deprecated code 2018-08-20 10:37:43 +02:00
Matthew Messinger
f8e54dfd90 Remove pointless instance field from GuiSkins 2018-08-19 18:09:39 -04: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
95107ddeed Fix error when downloading new skins. 2018-08-19 16:52:47 -04:00
Matthew Messinger
fbd7528993 Rewrite a bulk of ThreadDownloadImageETag to be more modern. 2018-08-19 14:52:24 -04:00
Matthew Messinger
1b8333e130 Delete unused Later class 2018-08-19 13:40:17 -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
902571198b Remove more unused imports 2018-08-15 17:45:43 +02: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