fixed rift serialization

src/main/java/org/dimdev/dimdoors/block/entity/ModBlockEntityTypes.java

@@ -27,8 +27,8 @@ public class ModBlockEntityTypes {
 			EntranceRiftBlockEntity::new,
 			ModBlocks.OAK_DIMENSIONAL_DOOR, ModBlocks.IRON_DIMENSIONAL_DOOR, ModBlocks.GOLD_DIMENSIONAL_DOOR, ModBlocks.QUARTZ_DIMENSIONAL_DOOR, ModBlocks.DIMENSIONAL_PORTAL);
 
-	private static <E extends BlockEntity> BlockEntityType<E> register(String id, Supplier<? extends E> supplier, Block... blocks) {
-		return Registry.register(Registry.BLOCK_ENTITY_TYPE, id, new BlockEntityType<>(supplier, Sets.newHashSet(blocks), null));
+	private static <E extends BlockEntity> BlockEntityType<E> register(String id, Supplier<E> supplier, Block... blocks) {
+		return Registry.register(Registry.BLOCK_ENTITY_TYPE, id, BlockEntityType.Builder.create(supplier, blocks).build(null));
 	}
 
 	public static void init() {

src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java

@@ -46,6 +46,7 @@ public abstract class RiftBlockEntity extends BlockEntity implements BlockEntity
 	// NBT
 	@Override
 	public void fromTag(BlockState state, CompoundTag nbt) {
+		super.fromTag(state, nbt);
 		this.deserialize(nbt);
 	}
 
@@ -55,9 +56,8 @@ public abstract class RiftBlockEntity extends BlockEntity implements BlockEntity
 
 	@Override
 	public CompoundTag toTag(CompoundTag tag) {
-		this.serialize(tag);
-
-		return super.toTag(tag);
+		super.toTag(tag);
+		return this.serialize(tag);
 	}
 
 	public CompoundTag serialize(CompoundTag tag) {

src/main/java/org/dimdev/dimdoors/pockets/generator/SchematicGenerator.java

@@ -64,18 +64,19 @@ public class SchematicGenerator extends VirtualPocket {
 	@Override
 	public Pocket prepareAndPlacePocket(PocketGenerationParameters parameters) {
 		ServerWorld world = parameters.getWorld();
-		VirtualLocation virtualLocation = parameters.getVirtualLocation();
+		VirtualLocation sourceVirtualLocation = parameters.getSourceVirtualLocation();
 		VirtualTarget linkTo = parameters.getLinkTo();
 		LinkProperties linkProperties = parameters.getLinkProperties();
 
 		PocketTemplateV2 template = SchematicV2Handler.getInstance().getTemplates().get(templateID);
 		if (template == null) throw new RuntimeException("Pocket template of id " + templateID + " not found!");
-		LOGGER.info("Generating pocket from template " + template.getId() + " at virtual location " + virtualLocation);
 
 		Pocket pocket = DimensionalRegistry.getPocketDirectory(world.getRegistryKey()).newPocket();
+		LOGGER.info("Generating pocket from template " + template.getId() + " at location " + pocket.getOrigin());
+
 		template.place(pocket);
 		template.setup(pocket, linkTo, linkProperties);
-		pocket.virtualLocation = virtualLocation;
+		pocket.virtualLocation = sourceVirtualLocation; //TODO: this makes very little sense
 		return pocket;
 	}
 

src/main/java/org/dimdev/dimdoors/pockets/selection/DepthDependentSelector.java

@@ -74,7 +74,7 @@ public class DepthDependentSelector extends VirtualPocket {
 
 	private VirtualPocket getNextPocket(PocketGenerationParameters parameters) {
 		for (Pair<String, VirtualPocket> pair : pocketList) {
-			if (Pattern.compile(pair.getLeft()).matcher(String.valueOf(parameters.getVirtualLocation().getDepth())).matches()) {
+			if (Pattern.compile(pair.getLeft()).matcher(String.valueOf(parameters.getSourceVirtualLocation().getDepth())).matches()) {
 				return pair.getRight();
 			}
 		}

src/main/java/org/dimdev/dimdoors/rift/targets/GlobalReference.java

@@ -26,7 +26,7 @@ public class GlobalReference extends RiftReference {
 
 	public static CompoundTag toTag(GlobalReference virtualTarget) {
 		CompoundTag tag = new CompoundTag();
-		tag.put("target", Location.toTag(virtualTarget.location));
+		tag.put("target", Location.toTag(virtualTarget.getReferencedLocation()));
 		return tag;
 	}
 

src/main/java/org/dimdev/dimdoors/rift/targets/RestoringTarget.java

@@ -11,14 +11,13 @@ public abstract class RestoringTarget extends VirtualTarget {
 	@Override
 	public Target receiveOther() {
 		if (this.getTarget() != null) {
-			this.getTarget().location = this.location;
 			return this.getTarget();
 		}
 
 		Location linkTarget = this.makeLinkTarget();
 		if (linkTarget != null) {
 			this.setTarget(RiftReference.tryMakeLocal(this.location, linkTarget));
-			this.getTarget().setLocation(this.location);
+			this.getTarget().setLocation(linkTarget);
 			this.getTarget().register();
 
 			return this.getTarget();

src/main/java/org/dimdev/dimdoors/util/PocketGenerationParameters.java

@@ -8,14 +8,14 @@ import org.dimdev.dimdoors.world.pocket.VirtualLocation;
 public class PocketGenerationParameters {
 	private final ServerWorld world;
 	private final String group;
-	private final VirtualLocation virtualLocation;
+	private final VirtualLocation sourceVirtualLocation;
 	private final VirtualTarget linkTo;
 	private final LinkProperties linkProperties;
 
-	public PocketGenerationParameters(ServerWorld world, String group, VirtualLocation virtualLocation, VirtualTarget linkTo, LinkProperties linkProperties) {
+	public PocketGenerationParameters(ServerWorld world, String group, VirtualLocation sourceVirtualLocation, VirtualTarget linkTo, LinkProperties linkProperties) {
 		this.world = world;
 		this.group = group;
-		this.virtualLocation = virtualLocation;
+		this.sourceVirtualLocation = sourceVirtualLocation;
 		this.linkTo = linkTo;
 		this.linkProperties = linkProperties;
 	}
@@ -28,8 +28,8 @@ public class PocketGenerationParameters {
 		return group;
 	}
 
-	public VirtualLocation getVirtualLocation() {
-		return virtualLocation;
+	public VirtualLocation getSourceVirtualLocation() {
+		return sourceVirtualLocation;
 	}
 
 	public VirtualTarget getLinkTo() {

src/main/java/org/dimdev/dimdoors/world/pocket/VirtualLocation.java

@@ -77,8 +77,7 @@ public class VirtualLocation {
 		if (virtualLocation == null) {
 			return new VirtualLocation(OVERWORLD, location.getX(), location.getZ(), 5);
 		}
-
-		return virtualLocation;
+		return new VirtualLocation(location.getWorldId(), location.getX(), location.getZ(), virtualLocation.getDepth());
 	}
 
 	public Location projectToWorld(boolean acceptLimbo) {