Commit graph

1430 commits

Author SHA1 Message Date
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