Commit graph

170 commits

Author SHA1 Message Date
Sollace
97b65b2ff9
Remove Spell#isDirty and Spell#setDirty 2024-09-21 21:40:20 +01:00
Sollace
0b7ef78cb8
Merge branch '1.20.2' into 1.20.4 2024-06-24 02:38:53 +01:00
Sollace
74a08b4820
Merge branch '1.20.1' into 1.20.2 2024-06-24 01:15:50 +01:00
Sollace
aaea2bfbc1
Account for the water's depth when determining the amount of lift pegasi should receive 2024-05-28 23:19:23 +01:00
Sollace
2edf2c6989
Implement data trackers for spells 2024-05-27 06:39:01 +01:00
Sollace
81db96d8a2
Compress nbt when sending it over the network 2024-05-25 15:03:26 +01:00
Sollace
1e3560fc04
Send tracked data in smaller packets to avoid large buffer allocation warnings being printed 2024-05-25 14:38:17 +01:00
Sollace
77de42dd09
Split the placed spell into separate types 2024-05-22 21:21:34 +01:00
Sollace
f8f60a8d3d
Implement custom data tracker 2024-05-21 22:51:42 +01:00
Sollace
715519e1f1
Increase energy cost when flying over the void. Fixes #356 2024-05-19 00:17:34 +01:00
Sollace
34afb1e087
Merge branch '1.20.2' into 1.20.4 2024-04-23 18:08:04 +01:00
Sollace
a48dffcf3a
Merge branch '1.20.1' into 1.20.2 2024-04-23 17:58:06 +01:00
Sollace
d83a3b0239
Fix compatibilty with HDSkins 2024-04-23 17:57:50 +01:00
Sollace
95abda651d
Merge branch '1.20.2' into 1.20.4 2024-04-23 14:52:08 +01:00
Sollace
fb216459b5
Merge branch '1.20.1' into 1.20.2 2024-04-23 14:51:47 +01:00
Sollace
03f4b4004e
Add spiral particle (wip) 2024-04-23 14:41:21 +01:00
Sollace
f68be46b0c
Add new chest type 2024-04-18 21:09:15 +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
7d63797d4d
Jars can now hold fluids 2024-03-31 22:34:31 +01:00
Sollace
ea9c3bfaf9
Move more tags to datagen 2024-03-31 14:01:52 +01:00
Sollace
2784627adc
Fix bugs and allow for storing bucketed entities in jars 2024-03-30 21:22:36 +00:00
Sollace
e65838b943
Rewrite changeling ability to apply over time. Closes #312 2024-03-28 21:31:06 +00:00
Sollace
dd8bf650d5
#168 Add speed boosts when performing stunts and add a stunt for flying at low altitude. 2024-03-26 20:46:19 +00:00
Sollace
9ef3a946f6
Cache computed shapes (should improve bed performance) 2024-03-25 00:41:18 +00:00
Sollace
0d88cb67e6
Merge branch '1.20.2' into 1.20.4 2024-03-20 22:16:00 +00:00
Sollace
c608a33aea
Merge branch '1.20.1' into 1.20.2 2024-03-20 21:49:36 +00:00
Sollace
f7534f9f84
Fixed being able to equip amulets the the chest slot when trinkets is installed. #300 2024-03-20 00:21:50 +00:00
Sollace
1c878be324
Fixed overlay on summoned minions not rendering correctly and make it shift through different colours 2024-03-12 14:53:02 +00:00
Sollace
6521262e78
Merge branch '1.20.2' into 1.20.4 2024-03-02 17:28:58 +00:00
Sollace
829a57d00d
Merge branch '1.20.1' into 1.20.2 2024-03-02 17:28:33 +00:00
Sollace
89aeb3903f
Fix #287 2024-03-02 17:08:17 +00:00
Sollace
7ba42552a4
Merge branch '1.20.2' into 1.20.4 2024-02-24 16:31:33 +00:00
Sollace
1c88d47e7b
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	gradle.properties
2024-02-24 16:30:51 +00:00
Sollace
0ba987159f
Prevent delta from becoming infinity or nan when duration is 0 2024-02-24 16:22:41 +00:00
Sollace
f9711b9043
Add error messages when lerping nan values 2024-02-24 16:09:02 +00:00
Sollace
3a5fb82a29
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BlockConstructionUtils.java
#	src/main/java/com/minelittlepony/unicopia/block/SpikesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/zap/ZapAppleLogBlock.java
2024-02-08 20:43:57 +00:00
Sollace
5cc612ca3a
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
#	src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java
#	src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java
#	src/main/java/com/minelittlepony/unicopia/item/URecipes.java
#	src/main/java/com/minelittlepony/unicopia/server/world/UnicopiaWorldProperties.java
2024-02-08 20:16:46 +00:00
Sollace
c30ef7e9c1
Give spikes their own damage type 2024-02-06 16:39:20 +00:00
Sollace
f51cb97721
Merge branch '1.20.2' into 1.20.4 2024-02-03 23:20:10 +00:00
Sollace
5af0f73f5c
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/network/MsgZapAppleStage.java
2024-02-03 23:19:53 +00:00
Sollace
4230518d08
Make the spectral clock more accurate 2024-02-03 12:42:26 +00:00
Sollace
398ed0743d
Merge branch '1.20.2' into 1.20.4
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesBlock.java
#	src/main/java/com/minelittlepony/unicopia/block/ZapAppleLeavesPlaceholderBlock.java
#	src/main/java/com/minelittlepony/unicopia/container/SpellbookChapterLoader.java
#	src/main/java/com/minelittlepony/unicopia/entity/mob/SpellbookEntity.java
#	src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
2024-02-02 22:35:42 +00:00
Sollace
ad1784b417
Merge branch '1.20.1' into 1.20.2
# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/element/Recipe.java
#	src/main/resources/assets/unicopia/lang/zh_cn.json
2024-02-02 21:08:49 +00:00
Sollace
8cb3ba298d
Fixed dark vortex particles not going to its actual center 2024-01-22 13:19:01 +00:00
Sollace
ab3ac8cb0d
Improve spell lookup performance by using the Ether 2024-01-20 15:12:23 +00:00
Sollace
d461b9ae04
1.20.2 -> 1.20.4 2023-12-30 11:55:26 +01:00
Sollace
0ab31bf3ac
Merge branch '1.20' into 1.20.2 2023-12-15 20:38:34 +00:00
Sollace
7e25107f7a
Add proper collission shapes for the cloud beds 2023-11-25 02:15:29 +00:00