Commit graph

983 commits

Author SHA1 Message Date
Sollace
fc57875596 *picks up house* *moves house outdoors* 2019-11-25 17:49:20 +02:00
Sollace
01c4844596 Squash the last build error 2019-11-25 16:12:28 +02:00
Sollace
45577a76d0 Convert the gear to mson 2019-11-25 16:09:58 +02:00
Sollace
3b38ec908c Convert the parts to mson 2019-11-25 16:09:21 +02:00
Sollace
79db99719c Convert the models to mson 2019-11-25 16:09:06 +02:00
Sollace
beb333db05 Fix error 2019-11-25 16:07:13 +02:00
Sollace
aff3f328ba Use the new kirin method to get out an entity renderer 2019-11-25 15:05:47 +02:00
Sollace
c71475be28 Move the snout, bat wings, and tail to json 2019-11-25 15:05:14 +02:00
Sollace
d5bcd31145 This is no longer applicable 2019-11-24 18:06:50 +02:00
Sollace
c56c99171a Migrate more parts to json 2019-11-24 18:05:56 +02:00
Sollace
ba52fe59de Convert elytra and pony head to json 2019-11-23 23:59:33 +02:00
Sollace
f7dd39e89a Moved Color to the common package 2019-11-23 23:20:24 +02:00
Sollace
d5f825523e Organise the packages 2019-11-23 23:19:13 +02:00
Sollace
2b7660816e These aren't really components. They're full models 2019-11-23 23:07:39 +02:00
Sollace
e1109223c2 Updating to 1.15-pre1 part 3 2019-11-23 23:06:07 +02:00
Sollace
4cc6d03fce Updating to 1.15-pre1 part 2 2019-11-23 20:32:44 +02:00
Sollace
be14188f87 Updating to 1.15-pre1 part 1 2019-11-23 19:28:42 +02:00
Sollace
61e8856fa9 Fix remapping error 2019-11-22 20:27:48 +02:00
Sollace
1f4d80a30e Why do we have this empty package? 2019-11-22 20:17:49 +02:00
Sollace
a4925cd2c1 Update mappings 2019-11-22 19:59:42 +02:00
Sollace
b6285fb833 Fixed texture bug on enderponies and skeletons 2019-11-07 20:12:06 +02:00
Sollace
de082acaea Clean up the PonyRenderers 2019-11-07 20:06:52 +02:00
Sollace
8a7253b345 Simplify the horn glow renderer a bit 2019-11-07 15:22:51 +02:00
Sollace
3edf26b1f5 Clear the villager base textures when reloading 2019-10-12 12:12:08 +02:00
Sollace
3593bf672b Moved the villager renderers into the villager package 2019-10-12 12:05:46 +02:00
Sollace
f03c2d709f Bat ponies and changelings can now wear saddlebags, but they use a built in texture for it 2019-10-12 12:03:16 +02:00
Sollace
87bdbcb904 Villagers can now be bats 2019-10-12 10:58:18 +02:00
Sollace
531f0f8d54 Update kirin, update hdskins 2019-10-06 12:36:01 +02:00
Sollace
434375e123 Oops. 2019-10-04 22:14:16 +02:00
Sollace
cc560615c9 Rewrite villager rendering and fix saddlebags not appearing correctly. Should fix #134 2019-10-04 21:31:48 +02:00
Sollace
5e4d27181e Horrible hack to fix unrecognised image formats (aaaaaaaaaaahhhh) 2019-10-04 18:34:55 +02:00
Sollace
ab23f3ccec Add a villager clothing layer 2019-08-24 16:11:45 +02:00
Sollace
8c9ff0c553 Fixed breezie antena being disjointed from their heads 2019-08-24 16:05:06 +02:00
Sollace
1532c7f158 Fixed Breezies 2019-08-24 16:01:34 +02:00
Sollace
aa0efe4f1e Moved Pillagers to be part of Illagers 2019-08-24 15:20:05 +02:00
Sollace
a79b6e69a2 Some cleanup 2019-08-24 15:04:55 +02:00
Sollace
4378c36122 Fixed stray clothing 2019-08-23 17:12:08 +02:00
Sollace
d5034d1930 Separate pillagers into their own setting (closes #131) 2019-08-23 11:19:22 +02:00
Sollace
8885b14593 Update HD Skins 2019-08-23 11:12:20 +02:00
Sollace
3a094fe1bf Fixed pony body parts appearing on players in spectator mode and possily invisible players/mobs 2019-08-18 15:53:15 +02:00
Sollace
e27fd49c40 Added full body overlays for ponies 2019-08-18 15:19:05 +02:00
Sollace
c33e0f0a46 World has a isAir method already 2019-08-12 16:56:31 +02:00
Sollace
15d67dad00 Fixed invalid characters in the resource path 2019-08-12 11:05:53 +02:00
Sollace
72d9fbad70 Rewrite armour texture resolution to prioritize our own naming scheme over what mods return 2019-08-12 10:57:07 +02:00
Sollace
0a32b1af06 Fixed encorrect head rotation when swimming/crawling 2019-08-11 13:55:39 +02:00
Sollace
aff5920b0e Added support for rendering legacy (vanilla) armour textures 2019-08-11 13:55:09 +02:00
Sollace
679869d3c6 Update Kirin 2019-08-05 11:32:27 +02:00
Sollace
5066c7ad64 Fixed head positioning on Drowned 2019-08-05 10:49:14 +02:00
Sollace
107aedb479 Fixed lighting weirdness o.o 2019-08-01 23:07:25 +02:00
Sollace
94091f1ae4 Slightly improve formatting on the scaling slider 2019-08-01 23:07:24 +02:00
Sollace
fc734c2334 Clamp to the ends so it's easier to reach the max/min on the slider. 2019-08-01 23:07:23 +02:00
Sollace
b45a2a9788 Unused import 2019-08-01 23:07:23 +02:00
keupoz
0cfede5f68 Added villagers head rolling while saying no 2019-07-25 16:57:00 +07:00
Matthew Messinger
2676503d98 Use config listeners for skulls. 2019-07-24 21:35:21 -04:00
Sollace
b3b165f803 Separate the horn and magic checks 2019-07-24 23:37:22 +02:00
Sollace
73db95a777 Add a fix for floating pegasi. 2019-07-22 20:07:11 +02:00
Sollace
4709e45d62 Unused import 2019-07-22 09:55:04 +02:00
Sollace
5e115e8c8b Fixed encorrect closing behaviour 2019-07-22 09:54:54 +02:00
Matthew Messinger
537b36a410 Fix close button not actually saving the settings 2019-07-21 18:31:45 -04:00
Matthew Messinger
37433ce75d Fix crash caused by PonySkullRenderer.resolve() being called too early. 2019-07-21 18:15:37 -04:00
Sollace
127c150107 Update to 1.14.4 2019-07-20 20:16:54 +02:00
Sollace
6226407826 Fixed wearables not appearing 2019-07-20 14:08:30 +02:00
Sollace
a17661124c Update HDSkins 2019-07-18 13:19:30 +02:00
Sollace
a18b2a46d9 Unicorns will swing their arms to punch when not holding anything 2019-07-18 09:29:07 +02:00
Sollace
ab3cd3f307 Fixed pony settings not going back to the ModMenu screen when opened from there 2019-07-16 17:52:39 +02:00
Sollace
7bff1f2625 Fixed mod menu messing with our button 2019-07-16 17:13:36 +02:00
Sollace
0056d078c9 Close the resource 2019-07-16 14:36:15 +02:00
Sollace
0dab332a0e Move everything related to PonyData parsing into the PonyData class 2019-07-16 14:20:18 +02:00
Sollace
a7664bbe71 Fixed humans appearing as ponies 2019-07-16 13:38:46 +02:00
Sollace
eb54809f1e Implement pose changes for the swimming mode 2019-07-16 12:14:22 +02:00
Sollace
402e055112 Fixed differing vertical position between humans and ponies 2019-07-16 11:50:50 +02:00
Sollace
74a09d7b0c Fixed crash when rendering player skulls for a player without a loaded skin 2019-07-16 09:20:40 +02:00
Sollace
cba4fac039 Fixed swapped components in horn colours 2019-07-16 09:12:38 +02:00
Sollace
49f394e367 Fixed encorrect angles calculated for differing y-positions, and properly skip out calculations when not looking at a block. Closes #123 2019-07-15 10:21:15 +02:00
Sollace
5ccb81bc11 Fixed shadow placement on foals 2019-07-15 09:38:44 +02:00
Sollace
b1f7cda8cc Fixed various bugs with sneaking placement 2019-07-15 09:37:43 +02:00
Sollace
c42dcfb14f Fixed blending on the player's reflection when rendering as a pony 2019-07-14 15:02:04 +02:00
Sollace
13ff5def65 Fixed crash when rendering a skull outside a world 2019-07-14 15:02:03 +02:00
Sollace
af9fe8579e Implement pony armour for the skin preview 2019-07-14 15:02:03 +02:00
Matthew Messinger
b3d849fdc9 Throw exceptions in Pony.getBufferedImage().
If an exception is thrown, don't save the Pony.
2019-07-13 20:11:14 -04:00
Sollace
3355a7cb8a Check empty image dimensions, and actually attempt to use the correct format 2019-07-14 01:56:08 +02:00
Sollace
1c33cc7461 This is why I shouldn't be up at 1AM writing code... 2019-07-14 01:34:14 +02:00
Sollace
857e06198a Return null for invalid resources rather than the missing texture (avoids de-allocating the missing texture's image) 2019-07-14 01:29:11 +02:00
Sollace
310e713d71 Remove the cache again 2019-07-14 01:23:14 +02:00
Matthew Messinger
e3a496be16 Make less calls to Pony.getBufferedImage() and actually close it. 2019-07-13 19:13:46 -04:00
Sollace
1911a6dde8 This is never going to be null. We have to check for the missing sprite instead. -_- 2019-07-14 01:10:42 +02:00
Sollace
9d481d90a0 Also catch the original exception 2019-07-14 01:07:16 +02:00
Sollace
752fd06389 This isn't so much a memory leak as an open faucet. 2019-07-14 00:51:53 +02:00
Sollace
7793dc003f We don't need to override holdItem for unicorns 2019-07-13 23:57:05 +02:00
Sollace
44b07c2b19 We can actually simplify this, a lot 2019-07-13 23:50:31 +02:00
Sollace
de55c38a74 Fixed items held by unicorns rotating weirdly whilst swimming/crawling 2019-07-13 23:47:57 +02:00
Sollace
3f4cbdb991 Fixed vertical positioning when swimming/crawling 2019-07-13 23:47:18 +02:00
Sollace
3b65a1dc4f Fixed: All the options were defaulted to false 2019-07-13 23:16:17 +02:00
Sollace
3c477745e4 Removed the PonySettings enum and separate the ModRenderers enum from the config 2019-07-12 17:06:03 +02:00
Sollace
da9c4ba89e Fixed #121 armour, arrows, and other things not rendering on Villagers 2019-07-11 19:21:00 +02:00
Sollace
4d81b3b449 Update Kirin 2019-07-11 19:20:13 +02:00
Sollace
b5708a9820 Move configs to Kirin 2019-07-11 09:50:07 +02:00
Matthew Messinger
f61090d9c9 Add a proper callback for clearing the skin cache 2019-07-10 21:32:36 -04:00
Matthew Messinger
be263eec85 Move skin server definition to be resource based instead of config. 2019-07-10 21:23:58 -04:00
Sollace
ec34f58d3d Added an option to control whether the Horse Button is visible or not 2019-07-10 17:09:40 +02:00
Sollace
c3ddc01422 Fix #120 (concurrent modification exception when computing villager textures) 2019-07-10 15:44:28 +02:00
Sollace
ee8e970cee Reduce the cutoff threshold 2019-07-09 14:40:55 +02:00
Sollace
54e939248f Stop logging 2019-07-09 14:09:47 +02:00
Sollace
589d218e91 Fix buckets. (and any other raytraced items) 2019-07-09 14:05:29 +02:00
Sollace
d58d854354 Removed the stream 2019-07-08 14:57:03 +02:00
Sollace
e618f3f2f6 More general cleanup 2019-07-08 11:05:32 +02:00
Matthew Messinger
25b19e8949 Forgot to make MineLittlePony non-abstract 2019-07-07 23:50:38 -04:00
Matthew Messinger
9c344c1554 Use MineLittlePony as entrypoint and move it to client package
If a server side mod needs to use it, a proper API class should be made.
2019-07-07 22:47:13 -04:00
Matthew Messinger
d8e1e08df4 General code cleanup.
Generic types
Unnecessary casts
Unused imports
2019-07-07 17:21:28 -04:00
Matthew Messinger
2b9eb813b3 Add hook for modmenu for config screen. 2019-07-07 17:21:28 -04:00
Sollace
9d97379655 Use a better way of resolving resources 2019-07-07 22:22:31 +02:00
Sollace
0e7fa5878f Redundant type arguments 2019-07-07 21:47:49 +02:00
Sollace
20de3dc7cb What is this? Am I a joke to you, Eclipse!? 2019-07-07 21:37:55 +02:00
Sollace
a39167ca11 Another one! 2019-07-07 21:33:42 +02:00
Sollace
6bf5c8990a Added a missing @Override 2019-07-07 21:26:00 +02:00
Sollace
b8c7960ac7 Huh. No longer necessary. I wonder why it didn't warn me about this... 2019-07-07 21:22:44 +02:00
Sollace
75f60a0185 Can't call this from a background thread, only the main one. 2019-07-06 21:59:19 +02:00
Sollace
0138938da3 Added a horsey button to the main menu. Now you can see if the mod is working :D 2019-07-06 19:17:46 +02:00
Sollace
3cc128ef2f Fixed: Dual weilding causes ponies to break the laws of physics 2019-07-06 18:29:28 +02:00
Sollace
53b2d0f370 Fixed: Model attributes aren't updated for the first person's view 2019-07-06 17:35:11 +02:00
Sollace
186011d9ee Eh 2019-07-06 01:01:26 +02:00
Sollace
f80166dd99 Fixed funky rotations when swimming. 2019-07-05 11:00:41 +02:00
Sollace
f1d1a2857d Fixed head positioning on swimming ponies 2019-07-05 10:28:50 +02:00
Sollace
c09d9d3a1e Unused imports 2019-07-05 09:51:02 +02:00
Matthew Messinger
ef2052a23e Fix worn head placement
Also shrink the headwear to be closer to vanilla. It helps to hide it while wearing the head.
2019-07-05 00:49:16 -04:00
Matthew Messinger
460e8c56b4 Move hdskins back to main
It wasn't going to stay there because loom doesn't support arbitrary mod configurations
2019-07-03 23:40:56 -04:00
Matthew Messinger
1cdc9582e3 Convert skins without hdskins 2019-07-03 23:26:19 -04:00
Matthew Messinger
f8a0bc308c Improve pony resolution 2019-07-03 22:06:00 -04:00
Matthew Messinger
6f6182e331 Remove hdskins requirement for parsing skins 2019-07-03 20:38:39 -04:00
Matthew Messinger
2ed76dbecc Remove usage of IModUtilities from hdskins. 2019-07-03 16:29:32 -04:00
Matthew Messinger
5791a021ef Fix GL loading
Works for resources and other player skins, broken for own skin
2019-07-03 16:27:43 -04:00
Matthew Messinger
70d24e377f Add some proxies for hdskins. Might remove later.
It can run without crashing without HDSkins
2019-07-03 16:27:43 -04:00
Matthew Messinger
0bcd2c1968 Move most hdskins related classes to new sourceset 2019-07-03 16:12:44 -04:00
Matthew Messinger
50686dd1b4 Pony: Fetch skin texture directly from the GL matrix 2019-07-03 15:37:47 -04:00
Sollace
db0e38678a Fixed unicorn horns not rendering with the correct colour 2019-07-03 19:07:01 +02:00
Sollace
8446ec3ca7 Fixed the pony level 2019-07-03 16:13:07 +02:00
Sollace
3f1744d98a Fixed eye position not being updated when joining a world, or when skins load 2019-07-03 15:58:40 +02:00
Sollace
9641bbfe5c Register the pony manager at the correct time 2019-07-03 14:16:03 +02:00
Sollace
098918c505 Fixed elder guardians appearing smol 2019-07-03 13:26:02 +02:00
Sollace
0140d6b413 Fixed seaponies. Resolves #119 2019-07-03 13:17:11 +02:00
Matthew Messinger
d4375dde47 Remove IModUtilities 2019-07-02 19:57:45 -04:00
Sollace
e3fac2476c Fixed legacy skin conversion (again) 2019-07-02 11:42:52 +02:00
Sollace
88b2228314 Fixed model scaling 2019-07-01 21:12:18 +02:00
Sollace
5116169f64 Future proof: Do NOT reference non-mojang classes outside of their designated context. That's what ModUtilities are for. 2019-07-01 10:59:55 +02:00
Matthew Messinger
91274352b4 Use the fabric library for rendering registration. 2019-06-30 22:54:43 -04:00
Sollace
a40bb7fa02 Fixed GL errors when unicorns hold enchanted items 2019-06-30 20:42:04 +02:00
Sollace
937e6a2af6 Make all the HDSkins classes package private so it's clear they're not meant to be referenced anywhere else 2019-06-30 13:00:29 +02:00
Sollace
0af45cf388 Update dependencies 2019-06-30 12:38:36 +02:00
Sollace
2f38419bc2 Convert the old Graphics calls into NativeImage calls (should fix legacy skins) 2019-06-30 12:32:11 +02:00
Sollace
e960aad9d5 Move all HDSkins references to one place 2019-06-30 12:05:38 +02:00
Sollace
b3be7a0b18 Added a meta-race for Kirins 2019-06-30 00:42:04 +02:00
Sollace
ec2ae1b549 Fixed various parts appearing/not appearing for the correct profession 2019-06-29 23:44:43 +02:00
Sollace
7f6222d0d6 Changed fallback handling for villager textures to try the plains biome as fail-safe before going to the default/nitwit texture 2019-06-29 23:44:12 +02:00
Sollace
fb235f9179 Update dependencies 2019-06-29 20:10:18 +02:00
Sollace
2950a4de0a Update to 1.14.3 2019-06-27 19:28:21 +02:00
Sollace
a1f40c9b59 Ponified Pillagers 2019-06-27 15:50:34 +02:00
Sollace
6a4d271b14 Fixed z-fighting in unicorn magic 2019-06-27 14:09:57 +02:00
Sollace
4ddbc897cf Fixed compatibility with CCL and other mods using the old proxy object pattern 2019-06-27 11:48:59 +02:00
Sollace
fe82f60ca3 That joke is no longer relevant :L 2019-06-27 10:27:34 +02:00
Sollace
833f11b4e9 Fixed head position and animation whilst swimming/crawling 2019-06-27 10:27:34 +02:00
Sollace
b290d4c7e7 Fixed offset on swimming ponies 2019-06-27 10:27:32 +02:00
Sollace
9999282070 Fixed some issues that shouldn't have been there. 2019-06-27 10:27:31 +02:00
Matthew Messinger
41580d058b Remove Chronic in favor for guava caches 2019-06-24 20:34:55 -04:00
Sollace
48d4a24fbd Fixed encorrect mirroring of bat wings @Keupoz#9578 2019-06-24 17:07:16 +02:00
Sollace
67f1e1edbd Fixed broken fire texture on villagers/zombie villagers 2019-06-24 14:05:07 +02:00
Sollace
229e0c3c30 Also update the javadoc 2019-06-24 13:12:13 +02:00
Sollace
1c8126215e Fixed model attributes being copied in the wrong direction. O.O 2019-06-24 13:11:51 +02:00
Sollace
9f9b3e5a2a Fixed right arm overlay being rendered instead of the right leg overlay 2019-06-24 12:09:31 +02:00
Sollace
594b23f67b Fixed torso overlay positioning when sneaking 2019-06-24 12:08:36 +02:00
Sollace
893751587d This is a feature now 2019-06-24 11:34:00 +02:00
Sollace
a26e26030e Simplify model classes/interfaces by moving all these properties to a separate class 2019-06-24 11:33:53 +02:00
Matthew Messinger
e6ace54fb4 Body overlay should be rendered before the tail. 2019-06-19 22:19:08 -04:00
Matthew Messinger
b4cc5b161d Properly render the body overlay with the correct scaling 2019-06-19 22:12:44 -04:00
Matthew Messinger
b56c75d646 Fix rear leg overlay not rendering 2019-06-19 21:23:15 -04:00
Sollace
2abc56cb54 Fixed arm position to match vanilla (removed the rotation too) 2019-06-11 15:16:15 +02:00
Sollace
00fec6900a Fixed resource reloading 2019-06-11 15:15:44 +02:00
Sollace
11391b6ed3 Fixed bugs with the debug bounding box 2019-06-11 14:10:36 +02:00
Sollace
f2a7189897 Fix positioning of the crossbow when held by unicorns 2019-06-11 12:22:58 +02:00
Sollace
276c86ebe0 Fixed HDSkins not using the actual skin servers we tell it to use 2019-06-11 01:06:17 +02:00
Sollace
cba057b10c Fixed crash due to a closed image 2019-06-11 00:44:10 +02:00
Sollace
fa3f26172e Fixed a mixin apply error when starting the game. 2019-06-11 00:44:10 +02:00
Sollace
916b3b11e0 Added a debug option to override the player's size 2019-06-05 15:42:20 +02:00
Sollace
f3f980d6c3 Added fillycam 2019-06-05 14:54:38 +02:00
Sollace
8157655434 I can't build against the new version of kirin so I assume it will come down eventually... 2019-06-04 19:02:56 +02:00
Sollace
e26eb09616 Moved the KeyBindings boilerplate to Kirin 2019-06-04 17:06:14 +02:00
Sollace
cc1bbbbd7b Update Kirin and HDSkins 2019-06-02 19:20:00 +02:00
Sollace
91f445e1fa Add TODOs with things to be done 2019-06-02 17:23:06 +02:00
Sollace
994892046c Ponified the Wandering Trader 2019-06-02 17:22:52 +02:00
Sollace
fd6c11b16b Handle spear and crossbow arm positions 2019-06-02 16:36:21 +02:00
Sollace
ad1d9d18ad Fixed crash when rendering skulls in the inventory 2019-06-02 16:01:24 +02:00
Sollace
fcc682af2b Ponified the Drowned 2019-06-02 15:53:30 +02:00
Sollace
4eb1dd019c Fixed hidden options turning off when you resize the screen and don't have the required key combination active 2019-06-02 15:18:17 +02:00
Sollace
0b7953393e Removed some debug rendering 2019-06-02 15:04:36 +02:00
Sollace
d590c8d9d6 Removed MixinMinecraftClient 2019-06-02 14:52:06 +02:00
Sollace
3ee6109cac Fixed FPS magic rendering 2019-06-02 14:20:42 +02:00
Matthew Messinger
cea3e11f05 1.14.2 and build tweaks 2019-06-01 15:40:06 -04:00
Sollace
7fbcc56d5e Fixed MixinFirstPersonRenderer 2019-06-01 21:29:53 +02:00
Sollace
05a882c515 Update kirin and hdskins 2019-06-01 20:48:09 +02:00
Sollace
1734505ac4 I now know what these parameters are! 2019-06-01 20:37:02 +02:00
Sollace
89d1ec3357 Update HDSkins and Kirin version 2019-06-01 16:59:05 +02:00