More moves and compilation fixes

api/src/main/java/appeng/api/implementations/items/ISpatialStorageCell.java

@@ -25,6 +25,7 @@ package appeng.api.implementations.items;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.DimensionType;
 
@@ -70,5 +71,5 @@ public interface ISpatialStorageCell {
      *
      * @return result of transition
      */
-    TransitionResult doSpatialTransition(ItemStack is, World w, WorldCoord min, WorldCoord max, int playerId);
+    TransitionResult doSpatialTransition(ItemStack is, ServerWorld w, WorldCoord min, WorldCoord max, int playerId);
 }

api/src/main/java/appeng/api/storage/data/IAEFluidStack.java

@@ -23,8 +23,8 @@
 
 package appeng.api.storage.data;
 
+import alexiil.mc.lib.attributes.fluid.volume.FluidKey;
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
-import net.minecraft.fluid.Fluid;
 
 /**
  * An alternate version of FluidStack for AE to keep tabs on things easier, and
@@ -64,9 +64,9 @@ public interface IAEFluidStack extends IAEStack<IAEFluidStack> {
     IAEFluidStack copy();
 
     /**
-     * quick way to get access to the Forge Fluid Definition.
+     * quick way to get access to the libblockaccess Fluid Definition.
      *
      * @return fluid definition
      */
-    Fluid getFluid();
+    FluidKey getFluid();
 }