Commit graph

3299 commits

Author SHA1 Message Date
Sollace
12bc0b6973
Rewrite the dark vortex to cause less lag and adjust/apply a cap to its maximum size 2024-04-07 20:27:15 +01:00
Sollace
835834a468
Update dependencies 2024-04-06 16:08:38 +01:00
横刀天笑(Knife smile)
b81e03a489
update zh_cn.json and HTP_CN (#319) 2024-04-06 15:10:46 +01:00
LingVarr
ea12ca7f24
Update ru_ru.json (#318) 2024-04-06 15:10:21 +01:00
Sollace
ca2be7ae85
Set the max count for fried axolotl to 1 (same as other bucket foods) 2024-04-05 23:41:51 +01:00
Sollace
7140ce6d0e
Return the empty container when eating stacked food with containers 2024-04-05 23:41:32 +01:00
Sollace
34bdd7f135
Set rock stew's max count to 1 2024-04-05 23:32:14 +01:00
Sollace
fcba23c8ed
Fix codec issues (again) 2024-04-05 23:30:43 +01:00
Sollace
dc7a5debaa
Fix spell ingredient serializing 2024-04-05 22:38:37 +01:00
Sollace
1980cf634e
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java
#	src/main/java/com/minelittlepony/unicopia/advancement/RacePredicate.java
#	src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java
#	src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
#	src/main/java/com/minelittlepony/unicopia/diet/affliction/StatusEffectAffliction.java
#	src/main/java/com/minelittlepony/unicopia/item/HeavyProjectileItem.java
#	src/main/resources/data/unicopia/tags/items/food_types/forage_nauseating.json
2024-04-05 22:01:26 +01:00
Sollace
9219b07aff
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	BlockusAddon
#	build.gradle
#	gradle.properties
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellEnhancingRecipe.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/SpellTraits.java
#	src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/Trait.java
#	src/main/java/com/minelittlepony/unicopia/advancement/SendViaDragonBreathScrollCriterion.java
#	src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
#	src/main/java/com/minelittlepony/unicopia/entity/Living.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
#	src/main/java/com/minelittlepony/unicopia/recipe/URecipes.java
#	src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
#	src/main/resources/data/unicopia/loot_tables/blocks/apple_pie.json
2024-04-05 20:19:13 +01:00
Sollace
5529382e71
Move recipes to their own package 2024-04-05 18:33:24 +01:00
Sollace
8c83647004
Add cooked and rotten variants of all the fish 2024-04-05 17:10:39 +01:00
Sollace
926b8088cf
Fix some food group names 2024-04-05 15:15:14 +01:00
Sollace
d6e1a6c3b8
Fixed slime pustule not triggering a redstone update above it 2024-04-05 15:07:21 +01:00
Sollace
56e91629b1
Fix some tag references and fix diets not loading 2024-04-05 15:07:07 +01:00
Sollace
eeded18c36
Move pony diets to datagen. Summary of diets:
Unicorns:
 - have a general even preference of foods
 - Improved benefits from cooking their food before eating it
 - Can still eat raw and rotten but at a reduced yield

Earth Ponies:
 - Are vegans
 - They get the most from foraging
 - Pastries are their passion
 - If they must eat meat, they have to cook it and not let it spoil.
 - They have a sweet tooth and prefer candy, desserts, and rocks
 - Candy and rocks gives them a massive saturation boost. Maybe too much?

Pegasus
 - prefer fish over other food sources
 - Cannot eat love, or raw/rotten meat
 - Can eat raw and rotten fish but still prefers if they are cooked
 - Can safely eat fresh and cooked fish with no ill effects
 - Is less affected when eating rotten fish

Bat Ponies:
 - prefer cooked foods over raw, and meat/insects over fish
 - Doesn't like baked goods but really likes meats, fish, and insects
 - Gets food poisoning from eating rotten and raw meat
 - Can eat cooked meat and insects without negative effects
 - Becomes hyper when eating mangoes

Kirins:
 - Much like Earth Ponies, Kirins must cook their meat before they eat it
 - Cannot eat love, or raw/rotten meats and fish
 - Can eat cooked meat and insect without negative effects
 - Can eat blinding, prickly, strengthening, and glowing foraged foods without negative effects

Changelings:
 - like meat and fish but really prefer feasting on ponies' love directly from the tap
 - Doesn't like baked goods but really likes meats, fish, and insects
 - Can eat fish, meat, insects, and love without negative effects
 - Gets sick when eating foraged plants and vegetables

Hippogriffs:
 - like fish, nuts, and seeds
 - Can eat fish and prickly foods without negative effect
 - Gains more health from pinecones

Seaponies:
 - can eat seaweed, kelp, shells, and other undersea foods
 - Can eat fish without negative effect
 - Gains more health from pinecones
2024-04-05 14:06:29 +01:00
Sollace
171c786dec
Datagen food groups+
- add more variety in the foraging groups
- rebalance the probability of negative effects/food poisoning when eating the foraged things
- add groups for rotten insect
- moved fermented spider eye to the rotten insect category
- removed unused foraging_moderate category
- fixed incorrect tag reference breaking sapling eating
2024-04-04 20:22:10 +01:00
Sollace
734e75f8c8
Add proper item models and textures for the slime pustule and mysterious egg 2024-04-02 16:25:28 +01:00
Sollace
4f613ebb91
Adjust food categorizations and move some more tags to datagen 2024-04-02 11:27:38 +01:00
Sollace
a87257de83
Use the id of the food group as the name rather than the tag 2024-04-02 08:30:54 +01:00
Sollace
3bc1628fd4
Datagen loot tables and partially rewrite food 2024-04-01 23:39:21 +01:00
Sollace
77d1d62494
Fix build 2024-03-31 22:47:27 +01:00
Sollace
7d63797d4d
Jars can now hold fluids 2024-03-31 22:34:31 +01:00
Sollace
a81336ef88
Switch support for farmer's delight to farmer's delight refabricated 2024-03-31 16:47:40 +01:00
Sollace
ec9a12bdf9
Clean up tags and fix some recipe unlock conditions 2024-03-31 14:35:04 +01:00
Sollace
ea9c3bfaf9
Move more tags to datagen 2024-03-31 14:01:52 +01:00
Sollace
1503cb5773
Set butterfly spawn conditions to include more blocks 2024-03-31 02:38:59 +01:00
Sollace
2784627adc
Fix bugs and allow for storing bucketed entities in jars 2024-03-30 21:22:36 +00:00
Sollace
f0b2a8a550
Made jars placeable 2024-03-30 02:19:54 +00:00
Sollace
1fd1782051
Added chocolate oatmeal cookie
Added scone
Added recipe to craft bread from oats
Changed hay fried recipe to be vertical
2024-03-29 20:32:50 +00:00
Sollace
f500956760
- Fix hot air balloons not orienting correctly when placed
- add sandbags that you interact with to steer them
- fix various hitbox jankyness
- exclude spectators from hot air balloon collision checks
2024-03-29 20:31:49 +00:00
Sollace
f8ff162d6c
Properly copy all stack attributes when consuming the bait from a fishing rod 2024-03-29 12:31:33 +00:00
Sollace
e65838b943
Rewrite changeling ability to apply over time. Closes #312 2024-03-28 21:31:06 +00:00
Sollace
3bab3c4f56
Add villagers to the list of entities that benefit from the crystal heart. Closes #184 2024-03-28 17:13:50 +00:00
Sollace
10dc8ce6d7
Check against offline players when trying to see if a spell can modify blocks at a location. Closes #283 2024-03-28 17:05:04 +00:00
Sollace
5109b67de2
Revert seaponies back to normal if we're not able to respawn them underwater 2024-03-28 16:23:42 +00:00
Sollace
11f0bbc4e4
Move advancements back down the tree and add some advancements for seaponies and hippogriffs 2024-03-28 16:23:12 +00:00
Sollace
82b74ecb18
Added feather touch enchantment 2024-03-28 15:32:21 +00:00
Sollace
74a11086d1
Added recipe for getting pegasus feathers from gryphon feathers 2024-03-28 15:32:00 +00:00
Sollace
6b3b5c7c86
Added baited fishing rod 2024-03-28 14:51:55 +00:00
Sollace
101a560a01
Improve hot air balloon animations and fix formatting 2024-03-28 13:48:12 +00:00
Sollace
3ff7466a54
Balloons now require fuel to run 2024-03-28 13:47:54 +00:00
Sollace
fbe444b56c
Fix janky hot air balloon physics 2024-03-28 12:08:06 +00:00
Sollace
93d11531d6
Use newer loom features for datagen 2024-03-27 19:44:12 +00:00
Sollace
ff47703140
Update blockus 2024-03-27 19:43:55 +00:00
Sollace
7cf32cce52
Added bowl of nuts, oatmeal cookie, and pinecone cookie 2024-03-27 19:24:06 +00:00
Sollace
c0a64a80f1
Fixed eating rock stew also consuming the bowl 2024-03-27 19:23:39 +00:00
Sollace
e931be3388
You can now harvest pinecones and acorns from spruce and oak leaves using a hoe 2024-03-27 19:23:16 +00:00
Sollace
e02c6f57a0
Bump blockus 2024-03-27 19:22:11 +00:00