Commit graph

990 commits

Author SHA1 Message Date
Matthew Messinger
62e77acc38 Make Ponies and metadata immutable 2017-06-16 02:13:24 -04:00
Matthew Messinger
825fc22f55 Fix mappings for hdskins 2017-06-16 02:11:38 -04:00
Matthew Messinger
05483e1961 Make LayerEntityOnPonyShoulder include more entities
Includes a method for getting a possible forge layer later.
2017-06-16 02:09:49 -04:00
Matthew Messinger
8b99a03e28 Remove randomness from mobs and fix some super issues
Also update mappings
2017-06-16 01:35:02 -04:00
Matthew Messinger
a165477108 Fix entities not rendering after reloading resources 2017-06-13 05:10:34 -04:00
Matthew Messinger
52da7f800b Fix vindicator's metadata not updating, causing its held item to be misplaced 2017-06-13 05:09:55 -04:00
Matthew Messinger
022a118450 Add mcp annotation for non-decomp builds (travis) 2017-06-13 04:21:43 -04:00
Matthew Messinger
df7c04ad30 Fix build error 2017-06-13 04:01:32 -04:00
Matthew Messinger
c9d7a394ad Update to 1.12
Changes:
 * Added a base layer class which can intelligently switch between pony and human.
 * Skins no longer are "converted" when they are already in the new format.
 * Illagers now use the existing model and texture format.
 * Metadata can now be read from the .mcmeta file (taken from old illagers)
 * Non-converted resources are no longer re-uploaded
 * (1.12) Parrots are rendered on the head instead of shoulders
2017-06-13 03:31:01 -04:00
Matthew Messinger
370e8e3af3 fix nullables and formatting 2017-06-13 01:27:30 -04:00
Matthew Messinger
a411969a98 Add package-info files for annotations 2017-06-12 23:44:34 -04:00
Matthew Messinger
3d818cd9d2 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2017-03-28 02:08:01 -04:00
Matthew Messinger
ba5642b310 Fix modded armors.
Bug 1: forge postinit wasn't being called. Probably issue with event stub. Got rid of it to avoid the hassle.
Bug 2: ForgeHooksClient stub had bad signatures.
2017-03-28 02:03:51 -04:00
Venaf
59b39f1080 Fix for extended wing position relative to body (#27) 2017-02-14 15:12:05 -05:00
Matthew Messinger
a1cb565275 Add travis config
Also another itemstack == null
2017-02-13 23:29:04 -05:00
Matthew Messinger
4fbf5b8a22 Delete the cache file when a 404 error occurs.
This will prevent the file from being loaded again if the connection fails in the future.
2016-12-30 00:44:35 -05:00
Matthew Messinger
a194aed282 Add a status check for 404 in the skin download.
Should not load from the cache if the skin was deleted.
2016-12-30 00:06:39 -05:00
Matthew Messinger
e016f420a7 Fix block heads for humans and add support for rendering items on the head. 2016-12-29 03:09:21 -05:00
Matthew Messinger
d68b335a62 override transform in humanplayer instead of testing instanceof. 2016-12-29 03:07:43 -05:00
Matthew Messinger
f5c2fe7045 Fix capes showing while elytra is worn 2016-12-29 03:06:25 -05:00
Matthew Messinger
e87c550f2b Use an etag for caching instead of md5.
Release for 1.11.2
2016-12-27 18:56:50 -05:00
Matthew Messinger
50e29823d7 put skin cache back in the skins folder and clear the internal cache when needed. 2016-12-27 01:57:58 -05:00
Matthew Messinger
d5e766aaef Mobs can now wear elytras. 2016-12-26 21:15:25 -05:00
Matthew Messinger
6c0542ff89 Fix rendering issues with elytra flight 2016-12-26 20:58:21 -05:00
Matthew Messinger
80516f9068 Fix head being wrong while riding after sneaking 2016-12-26 17:38:32 -05:00
Matthew Messinger
08860dd13e Fix hanging when loading several skins at once.
Fixes #25
2016-12-25 20:28:08 -05:00
Matthew Messinger
15eccc5b99 Search the resource packs for a human texture with higher priority. 2016-12-21 04:46:16 -05:00
Matthew Messinger
886b12f157 Fix armors for non-pony textures. 2016-12-21 03:22:15 -05:00
Matthew Messinger
d73f82173a Inline the skins localizations. 2016-12-21 01:22:55 -05:00
Matthew Messinger
8971183121 Add support for uploading elytras. 2016-12-21 01:20:02 -05:00
Matthew Messinger
77b79e432c Forgot to add mixin to config. 2016-12-20 05:29:37 -05:00
Matthew Messinger
e87717387e Fix log message in PonyManager 2016-12-20 05:29:12 -05:00
Matthew Messinger
3b5b4bf011 Rename PonyArmors to be more obvious that it wraps ForgeHooks. 2016-12-20 05:28:56 -05:00
Matthew Messinger
f626345e8c Fix #16 by using a mixin on the item renderer instead of trying to recreate it myself. 2016-12-20 05:19:57 -05:00
Matthew Messinger
3dce2be978 Don't "convert" a skin if it's an elytra or cape. 2016-12-20 01:36:34 -05:00
Matthew Messinger
e38611637a Fix forge issue by using a anonymous class for minecraft interfaces. 2016-12-20 01:35:20 -05:00
Matthew Messinger
33390c66d4 Fix missing wing when using optifine.
Why didn't I think of this earlier?
2016-12-08 04:02:22 -05:00
Matthew Messinger
0cfe8fdee7 sync the armor better.
This also fixes pegasus wings while riding.
2016-12-04 02:19:37 -05:00
Matthew Messinger
0c0a42be11 Fix horns 2016-12-02 11:00:47 -05:00
Matthew Messinger
bb469b725c Fix skin uploading 2016-12-02 10:50:46 -05:00
Matthew Messinger
e411f6680d Make changing mob ponifications not need a restart. 2016-12-01 02:24:21 -05:00
Matthew Messinger
9e951f5aa7 Add the vex textures and add the illagers to the options. 2016-12-01 02:21:35 -05:00
Matthew Messinger
aead97e244 Remove liteloader mappings "fixes". 2016-11-28 03:47:16 -05:00
Matthew Messinger
e9f04db833 Remove IPonyPart in favor of just a ModelBase. 2016-11-25 00:55:24 -05:00
Matthew Messinger
ef0f069e34 Code cleanup. 2016-11-25 00:37:49 -05:00
Matthew Messinger
b972fda9af Remove remote player skin metadata XP
Also use java 8.
2016-11-24 02:26:02 -05:00
Matthew Messinger
17ee345c11 Add the vindicator and evoker ponies 2016-11-24 02:03:40 -05:00
Matthew Messinger
8dfac7be08 Fix itemstack null checks 2016-11-22 16:20:23 -05:00
Matthew Messinger
9c7b6cd621 Simplify models a bit (TODO) 2016-11-22 16:19:18 -05:00
Matthew Messinger
7725da0710 Fix langs for hdskins. 2016-11-22 16:16:06 -05:00
Matthew Messinger
cc3c1b77b0 Add fixes for liteloader's outdated mappings.
Remove these when it updates
2016-11-22 16:14:27 -05:00
Matthew Messinger
945996cfa4 Update mappings 2016-11-22 16:13:24 -05:00
Matthew Messinger
bd597bbf1b Fix localizations. 2016-11-17 03:41:56 -05:00
Matthew Messinger
9fd9a1b7ec Add breezies as the vex. 2016-11-17 01:01:38 -05:00
Matthew Messinger
38ccaf8e2d Change package 2016-11-17 00:03:35 -05:00
Matthew Messinger
2245e42ad0 Initial update to 1.11. Features next. 2016-11-16 23:45:21 -05:00
Matthew Messinger
bf5b141687 Fix hd skin loading 2016-11-14 00:39:27 -05:00
Matthew Messinger
43d1edd030 Fix typo in stray resourcelocation path. (testures)
Also add metadata to setModelAttributes
2016-11-11 22:42:46 -05:00
Matthew Messinger
de518e7830 Fix dark spot on wings 2016-11-11 22:41:52 -05:00
Matthew Messinger
1fb6426bea Wrap loadTexture in a executor.
Fixes #18
2016-11-10 17:34:59 -05:00
Matthew Messinger
ab982a4125 Fix zombie_villager textures 2016-10-27 19:42:35 -04:00
Matthew Messinger
65e91b6650 Revert "Add forge dependency info" 2016-10-08 22:50:07 -04:00
Matthew Messinger
abd254170c Add forge dependency info. 2016-10-08 21:34:00 -04:00
Matthew Messinger
c673a56cb8 Search all resource domains for skins and add task to zip the defaults. 2016-09-10 00:32:02 -04:00
Matthew Messinger
130c927780 Convert entity resource textures. 2016-09-07 23:53:23 -04:00
Matthew Messinger
72a6387397 Move skins to a separate resource pack. Server admins can use them if they want. 2016-09-07 23:51:59 -04:00
Matthew Messinger
b4fd26f181 Switch custom skins to use futures 2016-08-27 23:16:31 -04:00
Matthew Messinger
4f74761163 Move custom skins into correct folder. (Maybe separate into resource pack) 2016-08-27 23:14:34 -04:00
Matthew Messinger
c219c66aef Fix issues with the skin menu.
Add a button to the main menu for skins
Add overriding skins with a resource pack. See the skins.json
Some default ponies are added. Spawn them using Citizens.
Etc.
2016-08-25 01:36:00 -04:00
Matthew Messinger
79ab9d51ee development on renderers and ponies 2016-08-22 17:33:50 -04:00
Matthew Messinger
6b3cd62549 Fix pony models when using forge.
Closes #15

Also maybe a NPE in hdskins (Probably need more nullchecks)
2016-08-22 17:29:27 -04:00
Matthew Messinger
c4e7213fc9 Fix a mixin. It worked in development. Maybe fix #11 2016-07-19 19:09:01 -04:00
Matthew Messinger
ffb39c2269 Add stray overlay texture and fix a small bug with planerenderer 2016-07-13 22:57:11 -04:00
Matthew Messinger
453b5e2156 Fix #10 sleeping ponies.
I swear I didn't creep on anypony to debug this.
2016-07-09 23:57:05 -04:00
Matthew Messinger
289f00bd6f Add a few more checks for flying skills (no more flying mud ponies) 2016-07-08 02:27:45 -04:00
Matthew Messinger
fded14ad6d fix #9 blocking with magic 2016-07-08 01:59:34 -04:00
Matthew Messinger
45ddc6baca update to 1.10.2
Work on better skin caching. Needs skin hash from server.
Fix up the stray skeleton. Still need proper textures
2016-07-07 02:57:52 -04:00
Matthew Messinger
6645410497 Update to 1.10 2016-06-19 15:46:37 -04:00
Matthew Messinger
81d6616e19 Fix the motion angles for other players. 2016-06-14 21:56:54 -04:00
Matthew Messinger
8d296149af Add some angle flight. Fully enabled while flying. Only when falling otherwise. 2016-06-14 21:37:41 -04:00
Matthew Messinger
f8bdd14322 Fix bow and arrows in offhand. 2016-06-12 14:19:17 -04:00
Ha3
69f369a957 Fix awkward walking animation when dual-wielding
This commit fixes the awkward situation where running while dual-wielding
causes the pony to appear to be sliding on their front hooves.

When the player is holding two items (non-blocking) while not flying, the
forehooves animation is now blended with the player speed. As the player
reaches walking speed, the "decreased" arm movement (less pendulum
rotation) is cancelled, causing the animation to appear as if the pony is not
holding any items.

When the player is not moving, or is flying, the original animation is preserved
(arms are leaning forward), even if the player is holding two items.
2016-06-10 01:03:44 +02:00
Matthew Messinger
56bd748a16 Fix sneaking legs 2016-06-08 19:42:43 -04:00
Matthew Messinger
40d8ba6704 Fix arrows with humans. 2016-05-29 23:59:43 -04:00
Matthew Messinger
4fb4a63f65 Opt to not use a map for meta. Use individual prefixed keys instead. Also translate them.
Not using a map will decrease the risk of an entry containing more than 255 chars (limit)
Fix some stuff for magic
2016-05-21 23:56:50 -04:00
Matthew Messinger
c4346e4812 make playermodel entity show wears. Maybe release tomorrow. 2016-05-21 02:01:01 -04:00
Matthew Messinger
665984cfa1 Fix #2 skin manager rendering after loading a world 2016-05-21 01:50:09 -04:00
Matthew Messinger
0ee3250930 Fix skeleton bow aiming (and maybe other mobs) 2016-05-20 16:39:50 -04:00
Matthew Messinger
379388bb3f Prevent wings from being considered for arrows. 2016-05-20 16:39:50 -04:00
Matthew Messinger
8fe82a826f Tweak a few animations 2016-05-20 16:39:49 -04:00
Matthew Messinger
16fd7ef973 Fix crash that somehow happened. 2016-05-20 16:39:48 -04:00
Matthew Messinger
adb2bad0ad Fix some language encoding 2016-05-20 16:39:47 -04:00
Matthew Messinger
5d763da488 Color selection works now 2016-05-20 16:39:46 -04:00
Matthew Messinger
4f73a60676 Fix skeleton bow aiming and arm rendering 2016-05-20 16:39:45 -04:00
Matthew Messinger
566bdce0a9 Make arms stretch out when elytra flying
# Conflicts:
#	src/main/java/com/brohoof/minelittlepony/model/pony/ModelSkeletonPony.java

# Conflicts:
#	src/main/java/com/brohoof/minelittlepony/model/pony/ModelSkeletonPony.java
2016-05-20 16:39:44 -04:00
Matthew Messinger
f9ebdd8867 Finish up metadata overrides.
+ Bug fixes
2016-05-20 16:38:53 -04:00
Matthew Messinger
d1662e8dc4 Basic support for changing skin meta. WIP 2016-05-20 16:21:14 -04:00
Matthew Messinger
4c2e661d99 Quick update to 1.9.4 2016-05-20 16:21:13 -04:00
Matthew Messinger
d818570012 Changes to the litemod.json 2016-05-20 16:14:11 -04:00
Matthew Messinger
c7cf2f3de2 Add basic support for skin meta using webprefs 2016-05-20 16:14:10 -04:00
Matthew Messinger
5ca99920c7 Fix crash when opening Skin manager 2016-05-20 16:14:10 -04:00
Matthew Messinger
b1ae2daf44 Add some more 1.9 functionality (left arm, shields, elytra) 2016-05-20 16:13:33 -04:00
Matthew Messinger
ce71badc7a Fix held item glow 2016-05-20 16:13:32 -04:00
Matthew Messinger
2d89d407f5 It compiles 2016-05-20 16:13:28 -04:00
Matthew Messinger
2ce811efa6 Check that server skin data is complete. 2016-04-13 21:08:54 -04:00
Matthew Messinger
bb5c99d5c7 add mixin annotation processor to eclipse 2016-04-13 21:05:51 -04:00
Matthew Messinger
c9b18a3ddf Fix clear cache button 2016-04-09 02:24:35 -04:00
Matthew Messinger
9b437ca587 Fix lots of model animation errors. 2016-04-09 02:24:15 -04:00
Matthew Messinger
53eaa3c40e Fix pig zombies not being earth ponies. 2016-04-08 21:40:08 -04:00
Matthew Messinger
08728bc5c7 Fix arrows 2016-04-08 21:39:52 -04:00
Matthew Messinger
2a99758a57 Fix pony sizes. Oops 2016-04-06 23:49:28 -04:00
Matthew Messinger
6b821a5804 Fix the skin converter for the wings. 2016-04-06 23:16:50 -04:00
Matthew Messinger
64b578bc70 Add missing Override's 2016-04-06 22:13:05 -04:00
Matthew Messinger
1d5e22040b Fix some issues when riding. 2016-04-03 01:05:31 -04:00
Matthew Messinger
8bec6f5b85 Fix left armwear being offset. 2016-04-02 22:57:32 -04:00
Matthew Messinger
f3a1c59a77 Workaround for mixin bug 2016-04-02 22:56:57 -04:00
Matthew Messinger
5f2da86116 update villager textures 2016-04-02 22:54:08 -04:00
Matthew Messinger
e18fd90c22 Fix wing textures 2016-03-16 00:41:42 -04:00
Matthew Messinger
5976606846 Fix descriptions 2016-03-16 00:40:27 -04:00
Matthew Messinger
01ea749732 SkullRenderer uses a Redirect now. 2016-03-16 00:40:17 -04:00
Matthew Messinger
1d40648e47 Fix some things 2016-03-09 17:07:40 -05:00
Matthew Messinger
10c4514492 Revert "Add some model children. May be buggy"
This reverts commit 57404a01cf.
2016-03-09 17:05:14 -05:00
Matthew Messinger
57404a01cf Add some model children. May be buggy 2016-03-08 22:00:28 -05:00
Matthew Messinger
c8aa2176a2 Move IRenderPony into its own package. It is a duck after all 2016-03-04 23:55:42 -05:00
Matthew Messinger
63a6ea9dc5 Remove AniParams. 2016-03-04 23:54:50 -05:00
Matthew Messinger
0ce565233c Make PlaneRenderer extend ModelRenderer 2016-03-04 23:53:35 -05:00
Matthew Messinger
375920b179 remove liteloader fix since liteloader is broken anyway 2016-03-01 00:40:11 -05:00
Matthew Messinger
53be604f85 Initial update for 1.8.9
- liteloader doesn't work yet so can't test.
2016-03-01 00:33:09 -05:00
Matthew Messinger
4f448be9b6 Fix some rendering and rotations 2016-02-29 23:42:22 -05:00
Matthew Messinger
daa00a044b prep for skin metadata
Other cleanup
2016-02-29 23:41:02 -05:00
Matthew Messinger
73af68dce5 remove the liteloader, jenkins ivy 2016-02-29 23:38:13 -05:00
Matthew Messinger
1a7860ff69 Fix glitches with humans
Fix settings not loading.
2016-01-28 22:11:11 -05:00
Matthew Messinger
aa9cd16293 Add support for model types. Still needs server support
Add back capes
2016-01-28 22:10:28 -05:00
Matthew Messinger
429266b971 Remove some debug code that caused a memory leak.
Also prevent the leak from happening in the future.
2016-01-27 23:26:12 -05:00
Matthew Messinger
e8f1a68fa3 Don't load the skin when checking if it exists. 2016-01-27 03:39:26 -05:00
Matthew Messinger
9e86a57360 Some cleanup. 2016-01-26 17:32:53 -05:00
Matthew Messinger
4b61d9c0ad Fix arm waving (again) 2016-01-26 16:43:39 -05:00
Matthew Messinger
1b9989164d Make LiteMod class a wrapper. 2016-01-26 03:20:39 -05:00
Matthew Messinger
d6f346eff9 Add sitting animation. Also fix armor 2016-01-26 03:20:12 -05:00
Matthew Messinger
e5559a5854 Fix held items being off when a filly
Move the forge model compat up
2016-01-26 03:18:44 -05:00
Matthew Messinger
4c6c644f6b Fix some mixins 2016-01-26 03:17:08 -05:00
Matthew Messinger
90352517d4 Remove voxelcommon 2016-01-26 03:16:11 -05:00
Matthew Messinger
45f408cf1b Port hdskins to mixins.
Other changes to HDSkinManager
Allow hd skins to be toggled on demand
Support small arms.
2016-01-19 00:34:07 -05:00
Matthew Messinger
15ce8e7ed0 Port to Mixin 2016-01-15 02:59:50 -05:00
Matthew Messinger
b4148959f7 Fix armors again 2016-01-13 21:00:07 -05:00
Matthew Messinger
8feb98a756 Fix mob armor being messed up 2015-12-28 20:52:58 -05:00
Matthew Messinger
99401877e1 Add separate left wing texture right below current texture 2015-12-28 20:20:07 -05:00
Matthew Messinger
69d1f76ada Rename some things. 2015-12-15 23:29:47 -05:00
Matthew Messinger
8dea16d563 Add some more randomness to mobs, finish villagers.
Fix skeleton rendering
2015-12-15 22:26:17 -05:00
Matthew Messinger
5a2c7cce85 Fix broken size config 2015-12-15 00:57:51 -05:00
Matthew Messinger
f8cc7d3268 Fix armor 2015-12-15 00:51:31 -05:00
Matthew Messinger
9dd9384d77 Split the mob rendering apart into their own classes.
Add some randomness for mob metadata.
2015-12-15 00:32:57 -05:00
Matthew Messinger
f56cea3597 Fix optifine 2015-12-14 05:42:18 -05:00
Matthew Messinger
e8021bc2fd Add model parts. Various improvements and removing of dead or obsolete classes/methods 2015-12-14 03:29:10 -05:00
Matthew Messinger
cbe19c4732 don't desaturate the colors. 2015-12-13 03:30:27 -05:00
Matthew Messinger
22d2c18e79 More work on item glow 2015-12-12 04:24:38 -05:00
Matthew Messinger
c8bdab408c Fix meta detection 2015-12-11 23:17:04 -05:00
Matthew Messinger
b04468266c Move into different sourcesets. 2015-12-09 16:05:21 -05:00
Matthew Messinger
674a02f1c9 Update all the skin resources to new format. No more 64x32 mob texures. 2015-12-09 01:01:34 -05:00
Matthew Messinger
6b8976c414 Bind skin when drawing arm in first person 2015-12-08 22:16:22 -05:00
Matthew Messinger
423064c504 Refactor skin meta and general cleanup. 2015-12-08 22:14:42 -05:00
Matthew Messinger
78d0052464 move the common package into forge. It's forge related after all. 2015-12-08 17:28:34 -05:00
Matthew Messinger
e668578771 Reimplement item glow 2015-12-08 16:53:47 -05:00
Matthew Messinger
903cb3a5eb merge common with root 2015-12-08 16:53:08 -05:00
Matthew Messinger
778630c6b5 Improve armor layer. Should support modded armor now.
pony armor textures go in modid:textures/entity/armor/custom_armor_1_pony.png
2015-11-17 00:21:53 -05:00
Matthew Messinger
f0509fbb28 Multi-project 2015-11-17 00:19:58 -05:00
Matthew Messinger
f438369f51 Make settings use Exposable, remove singleton of PonyManager 2015-11-17 00:17:35 -05:00
Matthew Messinger
9e707e4af9 Fix hd skins a bit more 2015-11-17 00:10:21 -05:00
Matthew Messinger
2a37a69f60 Fix neck texture 2015-11-17 00:09:38 -05:00
Matthew Messinger
2f01397d5e Change package 2015-11-17 00:09:04 -05:00
Matthew Messinger
0734ac963d Update to fg2 2015-10-06 18:42:46 -04:00
Matthew Messinger
667ab41d24 Some more cleanup. 2015-09-01 22:18:45 -04:00
Matthew Messinger
3f1e6a84f4 Fix human arm when sneaking 2015-08-17 02:20:31 -04:00
Matthew Messinger
e844b6105c Add translations for pony level 2015-08-17 01:54:56 -04:00
Matthew Messinger
50b0b668c7 Fix arm swinging with human's 2015-08-17 01:51:02 -04:00
Matthew Messinger
5895579412 Fix cape and arm texture. 2015-08-14 23:32:22 -04:00
Matthew Messinger
cfb94ae950 Brush pony 2015-08-14 23:25:40 -04:00
Matthew Messinger
3405dc2843 Fix unicorn nametags being black when an item is held.
Removed some code, reimplement sometime.
2015-08-13 00:49:28 -04:00
Matthew Messinger
48fce4e3b1 Fix guiskins constantly updating 2015-08-12 22:41:51 -04:00
Matthew Messinger
f1048026b3 Add translations, fix some rendering in guiskins and make it modular 2015-08-12 20:03:54 -04:00
Matthew Messinger
a49bae5b3b add some cape support, fully move item rendering into layers 2015-08-12 18:22:21 -04:00
Matthew Messinger
72e45ad08b Remove 32 version of human 2015-08-12 17:42:21 -04:00
Matthew Messinger
07246e2d16 Fix java 6. 2015-08-12 17:40:52 -04:00
Matthew Messinger
963a5e5a73 Fix flight and skins' bimap crash 2015-08-11 14:31:03 -04:00
Matthew Messinger
1dc6f0a99b Add skin drop 2015-08-11 14:30:38 -04:00
Matthew Messinger
929bc78b32 Undo player capabilities isFlying check for flight 2015-08-02 01:19:50 -04:00
Matthew Messinger
09217d136b Fix left leg 2015-08-02 00:19:14 -04:00
Matthew Messinger
40e5044b83 Fix armor 2015-08-02 00:07:38 -04:00
Matthew Messinger
2610610c76 Fix guiskins before world opens 2015-08-02 00:07:29 -04:00
Matthew Messinger
3316f7b695 init 2015-08-01 18:36:33 -04:00