diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemImpl.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemImpl.java
index 49ac3f58..9c2d250a 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/ItemImpl.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemImpl.java
@@ -157,7 +157,7 @@ public class ItemImpl implements Equine<ItemEntity> {
     @Override
     public void toNBT(NbtCompound compound, WrapperLookup lookup) {
         compound.putString("owner_race", getSpecies().getId().toString());
-        physics.toNBT(compound);
+        physics.toNBT(compound, lookup);
     }
 
     @Override
@@ -165,7 +165,7 @@ public class ItemImpl implements Equine<ItemEntity> {
         if (compound.contains("owner_race", NbtElement.STRING_TYPE)) {
             setSpecies(Race.fromName(compound.getString("owner_race"), Race.HUMAN));
         }
-        physics.fromNBT(compound);
+        physics.fromNBT(compound, lookup);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
index 34391bbe..d9e46302 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
@@ -461,7 +461,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
 
     @Override
     public void toNBT(NbtCompound compound, WrapperLookup lookup) {
-        enchants.toNBT(compound);
+        enchants.toNBT(compound, lookup);
         spells.getSlots().toNBT(compound, lookup);
         getCarrierId().ifPresent(id -> compound.putUuid("carrier", id));
         toSyncronisedNbt(compound, lookup);
@@ -469,7 +469,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
 
     @Override
     public void fromNBT(NbtCompound compound, WrapperLookup lookup) {
-        enchants.fromNBT(compound);
+        enchants.fromNBT(compound, lookup);
         spells.getSlots().fromNBT(compound, lookup);
         setCarrier(compound.containsUuid("carrier") ? compound.getUuid("carrier") : null);
         fromSynchronizedNbt(compound, lookup);
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
index 943ef645..058b2cb3 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
@@ -53,7 +53,6 @@ import com.minelittlepony.unicopia.entity.collision.EntityCollisions;
 import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity;
 import com.minelittlepony.unicopia.entity.collision.MultiBox;
 import com.minelittlepony.unicopia.item.BasketItem;
-import com.minelittlepony.unicopia.item.HotAirBalloonItem;
 import com.minelittlepony.unicopia.item.UItems;
 import com.minelittlepony.unicopia.item.component.UDataComponentTypes;
 import com.minelittlepony.unicopia.server.world.WeatherConditions;
@@ -370,7 +369,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
     protected ActionResult interactMob(PlayerEntity player, Hand hand) {
         ItemStack stack = player.getStackInHand(hand);
 
-        if (stack.getItem() instanceof HotAirBalloonItem && !hasBalloon()) {
+        if (stack.contains(UDataComponentTypes.BALLOON_DESIGN) && !hasBalloon()) {
             if (!player.getAbilities().creativeMode) {
                 stack.decrement(1);
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java
index 4edfaeff..ac9d2edf 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java
@@ -407,6 +407,7 @@ public class ButterflyEntity extends AmbientEntity {
             return VALUES[rand.nextInt(VALUES.length)];
         }
 
+        @Deprecated
         public static Variant byName(String name) {
             return CODEC.byId(name, BUTTERFLY);
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
index 7e63af08..bc3cf790 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
@@ -247,11 +247,11 @@ public class CastSpellEntity extends LightEmittingEntity implements Caster<CastS
             tag.putUuid("owningSpell", controllingSpellUuid);
         }
 
-        spells.getSlots().toNBT(tag, getWorld().getRegistryManager());
+        spells.getSlots().toNBT(tag, getRegistryManager());
         tag.putInt("age", age);
         tag.putInt("prevAge", prevAge);
         tag.putBoolean("dead", isDead());
-        tag.put("owner", owner.toNBT(getWorld().getRegistryManager()));
+        tag.put("owner", owner.toNBT(getRegistryManager()));
     }
 
     @Override
@@ -266,13 +266,13 @@ public class CastSpellEntity extends LightEmittingEntity implements Caster<CastS
         controllingEntityUuid = tag.containsUuid("owningEntity") ? tag.getUuid("owningEntity") : null;
         controllingSpellUuid = tag.containsUuid("owningSpell") ? tag.getUuid("owningSpell") : null;
 
-        spells.getSlots().fromNBT(tag, getWorld().getRegistryManager());
+        spells.getSlots().fromNBT(tag, getRegistryManager());
         age = tag.getInt("age");
         prevAge = tag.getInt("prevAge");
         setDead(tag.getBoolean("dead"));
 
         if (tag.contains("owner")) {
-            owner.fromNBT(tag.getCompound("owner"), getWorld().getRegistryManager());
+            owner.fromNBT(tag.getCompound("owner"), getRegistryManager());
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java
index abb2eda4..334ae70e 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/FairyEntity.java
@@ -220,7 +220,7 @@ public class FairyEntity extends PathAwareEntity implements DynamicLightSource,
     @Override
     public void writeCustomDataToNbt(NbtCompound tag) {
         super.writeCustomDataToNbt(tag);
-        tag.put("owner", owner.toNBT(getWorld().getRegistryManager()));
+        tag.put("owner", owner.toNBT(getRegistryManager()));
         stayingPos.ifPresent(pos -> {
             tag.put("stayingPos", NbtHelper.fromBlockPos(pos));
         });
@@ -230,7 +230,7 @@ public class FairyEntity extends PathAwareEntity implements DynamicLightSource,
     public void readCustomDataFromNbt(NbtCompound tag) {
         super.readCustomDataFromNbt(tag);
         if (tag.contains("owner")) {
-            owner.fromNBT(tag.getCompound("owner"), getWorld().getRegistryManager());
+            owner.fromNBT(tag.getCompound("owner"), getRegistryManager());
         }
         stayingPos = tag.contains("stayingPos") ? NbtHelper.toBlockPos(tag, "stayingPos") : Optional.empty();
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java
index 2f739a18..673df0bd 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/FloatingArtefactEntity.java
@@ -161,7 +161,7 @@ public class FloatingArtefactEntity extends StationaryObjectEntity {
     @Override
     protected void readCustomDataFromNbt(NbtCompound compound) {
         super.readCustomDataFromNbt(compound);
-        setStack(ItemStack.fromNbtOrEmpty(getWorld().getRegistryManager(), compound.getCompound("Item")));
+        setStack(ItemStack.fromNbtOrEmpty(getRegistryManager(), compound.getCompound("Item")));
         setState(State.valueOf(compound.getInt("State")));
         setRotationSpeed(compound.getFloat("spin"), compound.getInt("spinDuration"));
         ticksUntilRegen = compound.getInt("regen");
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/IgnominiousBulbEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/IgnominiousBulbEntity.java
index c307c45f..5f536a3e 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/IgnominiousBulbEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/IgnominiousBulbEntity.java
@@ -340,7 +340,7 @@ public class IgnominiousBulbEntity extends MobEntity {
         getTentacles().forEach((pos, tentacle) -> {
             var compound = new NbtCompound();
             compound.put("pos", NbtHelper.fromBlockPos(pos));
-            compound.put("target", tentacle.toNBT(getWorld().getRegistryManager()));
+            compound.put("target", tentacle.toNBT(getRegistryManager()));
             tentacles.add(compound);
         });
         nbt.put("tentacles", tentacles);
@@ -357,7 +357,7 @@ public class IgnominiousBulbEntity extends MobEntity {
                 nbt.getList("tentacles", NbtElement.COMPOUND_TYPE).forEach(tag -> {
                     var compound = (NbtCompound)tag;
                     NbtHelper.toBlockPos(compound, "pos").ifPresent(pos -> {
-                        tentacles.put(pos, new EntityReference<>(compound.getCompound("target"), getWorld().getRegistryManager()));
+                        tentacles.put(pos, new EntityReference<>(compound.getCompound("target"), getRegistryManager()));
                     });
                 });
                 this.tentacles = tentacles;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java
index cbfc1c6f..79c0a91c 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/MimicEntity.java
@@ -328,7 +328,7 @@ public class MimicEntity extends PathAwareEntity {
     @Nullable
     private ChestBlockEntity readChestData(NbtCompound nbt) {
         BlockState state = BlockState.CODEC.decode(NbtOps.INSTANCE, nbt.getCompound("state")).result().get().getFirst();
-        if (BlockEntity.createFromNbt(getBlockPos(), state, nbt.getCompound("data"), getWorld().getRegistryManager()) instanceof ChestBlockEntity data) {
+        if (BlockEntity.createFromNbt(getBlockPos(), state, nbt.getCompound("data"), getRegistryManager()) instanceof ChestBlockEntity data) {
             data.setWorld(getWorld());
             ((MimicGeneratable)data).setAllowMimics(false);
             return data;
@@ -347,7 +347,7 @@ public class MimicEntity extends PathAwareEntity {
     @Nullable
     private NbtCompound writeChestData(ChestBlockEntity chestData) {
         NbtCompound chest = new NbtCompound();
-        chest.put("data", chestData.createNbtWithId(getWorld().getRegistryManager()));
+        chest.put("data", chestData.createNbtWithId(getRegistryManager()));
         chest.put("state", BlockState.CODEC.encode(chestData.getCachedState(), NbtOps.INSTANCE, new NbtCompound()).result().get());
         return chest;
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
index d88b2574..7015021a 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/SombraEntity.java
@@ -676,7 +676,7 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
         getHomePos().map(NbtHelper::fromBlockPos).ifPresent(pos -> {
             nbt.put("homePos", pos);
         });
-        nbt.put("cloud", stormCloud.toNBT(getWorld().getRegistryManager()));
+        nbt.put("cloud", stormCloud.toNBT(getRegistryManager()));
         nbt.putFloat("size", getScaleFactor());
     }
 
@@ -690,7 +690,7 @@ public class SombraEntity extends HostileEntity implements ArenaCombatant, Parti
             bossBar.setName(getDisplayName());
         }
         setScaleFactor(nbt.getFloat("size"));
-        stormCloud.fromNBT(nbt.getCompound("cloud"), getWorld().getRegistryManager());
+        stormCloud.fromNBT(nbt.getCompound("cloud"), getRegistryManager());
     }
 
     private static class SombraBossBar extends ServerBossBar {
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java
index 536f2bfa..1c45c285 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java
@@ -307,7 +307,7 @@ public class StormCloudEntity extends Entity implements MagicImmune {
                         if (source.getAttacker() instanceof PlayerEntity player) {
                             builder = builder.add(LootContextParameters.LAST_DAMAGE_PLAYER, player).luck(player.getLuck());
                         }
-                        getWorld().getRegistryManager().get(RegistryKeys.LOOT_TABLE).get(table)
+                        getRegistryManager().get(RegistryKeys.LOOT_TABLE).get(table)
                             .generateLoot(builder.build(LootContextTypes.ENTITY), 0L, this::dropStack);
                     }
                     kill();
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java
index f668560c..168ea2bb 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java
@@ -179,8 +179,8 @@ public class MagicBeamEntity extends MagicProjectileEntity implements Caster<Mag
     public void readCustomDataFromNbt(NbtCompound compound) {
         super.readCustomDataFromNbt(compound);
         getDataTracker().set(HYDROPHOBIC, compound.getBoolean("hydrophobic"));
-        physics.fromNBT(compound);
-        spells.getSlots().fromNBT(compound, getWorld().getRegistryManager());
+        physics.fromNBT(compound, getRegistryManager());
+        spells.getSlots().fromNBT(compound, getRegistryManager());
         var level = Levelled.fromNbt(compound.getCompound("level"));
         dataTracker.set(MAX_LEVEL, level.getMax());
         dataTracker.set(LEVEL, level.get());
@@ -195,7 +195,7 @@ public class MagicBeamEntity extends MagicProjectileEntity implements Caster<Mag
         compound.put("level", level.toNbt());
         compound.put("corruption", corruption.toNbt());
         compound.putBoolean("hydrophobic", getHydrophobic());
-        physics.toNBT(compound);
-        spells.getSlots().toNBT(compound, getWorld().getRegistryManager());
+        physics.toNBT(compound, getRegistryManager());
+        spells.getSlots().toNBT(compound, getRegistryManager());
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
index 4ca1fa1f..88c85231 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
@@ -176,8 +176,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements WeaklyOwn
     @Override
     public void readCustomDataFromNbt(NbtCompound compound) {
         super.readCustomDataFromNbt(compound);
-        homingTarget.fromNBT(compound.getCompound("homingTarget"), getWorld().getRegistryManager());
-        getMasterReference().fromNBT(compound.getCompound("owner"), getWorld().getRegistryManager());
+        homingTarget.fromNBT(compound.getCompound("homingTarget"), getRegistryManager());
+        getMasterReference().fromNBT(compound.getCompound("owner"), getRegistryManager());
         if (compound.contains("maxAge", NbtElement.INT_TYPE)) {
             maxAge = compound.getInt("maxAge");
         }
@@ -186,8 +186,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements WeaklyOwn
     @Override
     public void writeCustomDataToNbt(NbtCompound compound) {
         super.writeCustomDataToNbt(compound);
-        compound.put("homingTarget", homingTarget.toNBT(getWorld().getRegistryManager()));
-        compound.put("owner", getMasterReference().toNBT(getWorld().getRegistryManager()));
+        compound.put("homingTarget", homingTarget.toNBT(getRegistryManager()));
+        compound.put("owner", getMasterReference().toNBT(getRegistryManager()));
         compound.putInt("maxAge", maxAge);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
index 81d634b5..18a65522 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/PhysicsBodyProjectileEntity.java
@@ -172,7 +172,7 @@ public class PhysicsBodyProjectileEntity extends PersistentProjectileEntity impl
 
     @Override
     public DamageSources getDamageSources() {
-        return new DamageSources(getWorld().getRegistryManager()) {
+        return new DamageSources(getRegistryManager()) {
             @Override
             public DamageSource arrow(PersistentProjectileEntity source, @Nullable Entity attacker) {
                 return create(damageType, source, attacker);
@@ -299,7 +299,7 @@ public class PhysicsBodyProjectileEntity extends PersistentProjectileEntity impl
     @Override
     public void readCustomDataFromNbt(NbtCompound nbt) {
         super.readCustomDataFromNbt(nbt);
-        setStack(ItemStack.fromNbtOrEmpty(getWorld().getRegistryManager(), nbt.getCompound("Item")));
+        setStack(ItemStack.fromNbtOrEmpty(getRegistryManager(), nbt.getCompound("Item")));
         if (nbt.contains("damageType", NbtElement.STRING_TYPE)) {
             Optional.ofNullable(Identifier.tryParse(nbt.getString("damageType"))).ifPresent(id -> {
                 setDamageType(RegistryKey.of(RegistryKeys.DAMAGE_TYPE, id));