Commit graph

564 commits

Author SHA1 Message Date
Sollace
29c5f32f0d Merge branch 'master' into hdskins_rewrites
# Conflicts:
#	src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
#	src/hdskins/java/com/voxelmodpack/hdskins/PreviewTextureManager.java
#	src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
#	src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/SkinServer.java
#	src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
2018-08-06 20:27:12 +02:00
Sollace
843c8abbba Use StringUtils. Longer method but seemingly better for performance. Though the change is pointlessly irrelevent. 2018-08-06 18:48:45 +02:00
Sollace
31d7fdad0b Use volatile for changeable resourcces 2018-08-06 18:47:49 +02:00
Sollace
fd9d9a64ed Correct whitespace 2018-08-06 18:47:45 +02:00
Sollace
2d0a71edb8 We really don't need any of this 2018-08-06 18:46:46 +02:00
Sollace
f32611a1eb Sick and tired of these optionals 2018-08-06 18:46:42 +02:00
Sollace
92209cbf1f Default button id is 5k 2018-08-06 18:44:52 +02:00
Sollace
28871730e6 Fix whitespace
Try to fix gradle

Try to fix gradle

Gradlew has always on DRM confirmed

Try to fix gradle

Try to fix gradle

Try to fix gradle

Try to FIX GRADLE

TRY TO FIX GRADLE

T$WEPHIWEGWEPGHIWGEPIW$GYRWRY

BUILD SUCCESSFUL in 30s

Fix indentation
2018-08-06 18:44:51 +02:00
Sollace
7218d7fbdd Broken back 2018-08-06 18:44:51 +02:00
Sollace
993eb7ac37 Don't have to check for stuff if you throw instead 2018-08-06 18:44:50 +02:00
Sollace
bd010d6d97 Fix head position an vertical alignment issues when sneaking 2018-08-06 18:44:50 +02:00
Sollace
b5dfd57727 I finally got tired of this 2018-08-06 18:44:49 +02:00
Sollace
ee16139876 -Empty package 2018-08-06 18:44:49 +02:00
Sollace
7e1f2f9930 Fixed not being able to select an elytra texture 2018-08-06 18:44:48 +02:00
Sollace
b0c5c5d73f Fixed animation issues 2018-08-06 18:44:47 +02:00
Sollace
e035a9651e Oh now _that's_ what that was for! 2018-08-06 18:44:47 +02:00
Sollace
efc5d2932a Added jumping and sneaking when previewing a skin 2018-08-06 18:44:46 +02:00
Sollace
65c8220d7a More rendering shenanigans 2018-08-06 18:44:46 +02:00
Sollace
e2b6075fb6 Remove the c/p to prevent future errors 2018-08-06 18:44:45 +02:00
Sollace
a4e329d7fa Fixed Elytras not appearing in the correct place on skin previews. 2018-08-06 18:44:45 +02:00
Sollace
4e77f96fa5 Fixed more rendering shenanigans 2018-08-06 18:44:44 +02:00
Sollace
c89ba10a5b Fixed lighting being reversed 2018-08-06 18:44:44 +02:00
Sollace
2284fced64 Center the preview models so rotating isn't as janked 2018-08-06 18:44:43 +02:00
Sollace
63bd448c05 Make the reflections slightly more reflection-y 2018-08-06 18:44:43 +02:00
Sollace
25a501ba34 Move the GuiItemStackButton to live with the rest of the gui classes and improved error message handling 2018-08-06 18:44:42 +02:00
Sollace
54e008eb7c Split the elytra button into its own toggle 2018-08-06 18:44:42 +02:00
Sollace
c9fc4f9467 Use translation strings for all the options! 2018-08-06 18:44:41 +02:00
Sollace
0f634e9ea6 Fix layering of tooltips and make buttons more hmmmhmmmhmmm 2018-08-06 18:44:41 +02:00
Sollace
380a23f932 Arrange buttons 2018-08-06 18:44:40 +02:00
Sollace
94b01a460f Fix seapony toggles (again) and center the skin manager title 2018-08-06 18:44:39 +02:00
Sollace
2716de4b4b Fixed the seapony toggle buttons 2018-08-06 18:44:39 +02:00
Sollace
1ac52b28a7 Fixed remote preview player not being scaled correctly 2018-08-06 18:44:38 +02:00
Sollace
83659d80ca Rewrite GuiSkins 2018-08-06 18:44:34 +02:00
Sollace
34dae0168d Rewrite GuiSkins 2018-08-06 18:41:47 +02:00
Sollace
2de216842f Move the gui stuff to a common sourceset so I can use it in HDSkins 2018-08-06 18:35:13 +02:00
Sollace
05bd9b0ac3 Use the textureloader for this instead 2018-08-06 18:35:13 +02:00
Sollace
c1676bf778 Add some colour to the skin server info window 2018-08-06 18:35:12 +02:00
Sollace
834c5c6daa java.io.FileNotFoundException: minecraft:skins/preview_${profile.getname()}.png 2018-08-06 18:35:12 +02:00
Sollace
892553838b Fix error due to cross thread shenanigans 2018-08-06 18:35:11 +02:00
Sollace
26a7d87e10 Don't swallow exceptions 2018-08-06 18:35:11 +02:00
Sollace
3a8205463a Fix NPE at startup 2018-08-06 18:35:10 +02:00
Sollace
1ea7ed0c6b Asynchronous fetch preview textures 2018-08-06 18:35:10 +02:00
Sollace
b12567b033 Ensure skin servers have a valid address (or gateway in the case of legacy) 2018-08-06 18:35:10 +02:00
Sollace
9a629587ab NetClient now vomits IOExceptions 2018-08-06 18:35:09 +02:00
Sollace
b5185fa887 Fix rebase errors 2018-08-06 18:35:08 +02:00
Sollace
890b9650f4 Document and fixup NetClient to be more flexible 2018-08-06 18:35:08 +02:00
Sollace
e071242fd3 Decluster this epic 2018-08-06 18:35:08 +02:00
Sollace
cba69ae1f5 Awkward code is awkward 2018-08-06 18:35:07 +02:00
Sollace
712c98bb6b Docs 2018-08-06 18:35:06 +02:00
Sollace
70f96723e6 Split off the boilerplate code 2018-08-06 18:35:03 +02:00