Cache rift data

src/main/java/org/dimdev/dimdoors/api/util/NbtUtil.java

@@ -2,9 +2,12 @@ package org.dimdev.dimdoors.api.util;
 
 import com.mojang.serialization.Codec;
 
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
 
+import net.fabricmc.fabric.api.util.NbtType;
+
 public class NbtUtil {
 	public static <T> T deserialize(Tag data, Codec<T> codec) {
 		return NbtOps.INSTANCE.withParser(codec).apply(data).getOrThrow(true, a -> {
@@ -15,4 +18,12 @@ public class NbtUtil {
 		return NbtOps.INSTANCE.withEncoder(codec).apply(data).getOrThrow(true, a -> {
 		});
 	}
+
+	public static CompoundTag asCompoundTag(Tag tag, String error) {
+		if (tag == null || tag.getType() == NbtType.COMPOUND) {
+			return (CompoundTag) tag;
+		}
+
+		throw new RuntimeException(error);
+	}
 }

src/main/java/org/dimdev/dimdoors/pockets/PocketLoader.java

@@ -23,6 +23,8 @@ import net.minecraft.util.Identifier;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.dimdev.dimdoors.api.util.NbtUtil;
+import org.dimdev.dimdoors.block.entity.RiftData;
 import org.dimdev.dimdoors.pockets.generator.PocketGenerator;
 import org.dimdev.dimdoors.pockets.virtual.VirtualPocket;
 import org.dimdev.dimdoors.api.util.WeightedList;
@@ -35,6 +37,7 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
 	private Map<Identifier, PocketGenerator> pocketGeneratorMap = new ConcurrentHashMap<>();
 	private Map<Identifier, VirtualPocket> pocketGroups = new ConcurrentHashMap<>();
 	private Map<Identifier, PocketTemplate> templates = new ConcurrentHashMap<>();
+	private Map<Identifier, CompoundTag> riftDataMap = new ConcurrentHashMap<>();
 
 	private PocketLoader() {
 	}
@@ -44,14 +47,17 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
 		pocketGeneratorMap.clear();
 		pocketGroups.clear();
 		templates.clear();
+		riftDataMap.clear();
 
 		CompletableFuture<Map<Identifier, PocketGenerator>> futurePocketGeneratorMap = loadResourcePathFromJsonToMap(manager, "pockets/generators", this::loadPocketGenerator);
 		CompletableFuture<Map<Identifier, VirtualPocket>> futurePocketGroups = loadResourcePathFromJsonToMap(manager, "pockets/groups", this::loadPocketGroup);
 		CompletableFuture<Map<Identifier, PocketTemplate>> futureTemplates = loadResourcePathFromCompressedNbtToMap(manager, "pockets/schematic", ".schem", this::loadPocketTemplate);
+		CompletableFuture<Map<Identifier, CompoundTag>> futureRiftDataMap = loadResourcePathFromJsonToMap(manager, "pockets/json", t -> NbtUtil.asCompoundTag(t, "Could not load rift data since its json does not represent a CompoundTag!"));
 
 		pocketGeneratorMap = futurePocketGeneratorMap.join();
 		pocketGroups = futurePocketGroups.join();
 		templates = futureTemplates.join();
+		riftDataMap = futureRiftDataMap.join();
 	}
 
 	private <T> CompletableFuture<Map<Identifier, T>> loadResourcePathFromJsonToMap(ResourceManager manager, String startingPath, Function<Tag, T> reader) {
@@ -71,7 +77,7 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
 						})));
 	}
 
-	private <T> CompletableFuture<Map<Identifier, T>> loadResourcePathFromCompressedNbtToMap(ResourceManager manager, String startingPath, String extension, Function<Tag, T> reader) {
+	private <T> CompletableFuture<Map<Identifier, T>> loadResourcePathFromCompressedNbtToMap(ResourceManager manager, String startingPath, String extension, Function<CompoundTag, T> reader) {
 		int sub = startingPath.endsWith("/") ? 0 : 1;
 
 		Collection<Identifier> ids = manager.findResources(startingPath, str -> str.endsWith(extension));
@@ -108,23 +114,8 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
 //		}
 //    }
 
-	// TODO: load via resource loader
+	public Tag getRiftDataTag(String id) {
-	public Tag readNbtFromJson(String id) {
+		return this.riftDataMap.get(new Identifier(id));
-		try {
-			Path path = Paths.get(PocketLoader.class.getResource("/resourcepacks/default_pockets/data/dimdoors/pockets/json/" + id + ".json").toURI());
-			if (!Files.isRegularFile(path)) {
-				return null;
-			}
-			try {
-				JsonElement json = GSON.fromJson(String.join("", Files.readAllLines(path)), JsonElement.class);
-				return JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json);
-			} catch (IOException e) {
-				LOGGER.error(e);
-			}
-		} catch (URISyntaxException e) {
-			LOGGER.error(e);
-		}
-		return null;
 	}
 
 	private VirtualPocket loadPocketGroup(Tag tag) {
@@ -132,18 +123,12 @@ public class PocketLoader implements SimpleSynchronousResourceReloadListener {
 	}
 
 	private PocketGenerator loadPocketGenerator(Tag tag) {
-		if (tag == null || tag.getType() != NbtType.COMPOUND) {
+		return PocketGenerator.deserialize(NbtUtil.asCompoundTag(tag, "Could not load PocketGenerator since its json does not represent a CompoundTag!"));
-			throw new RuntimeException("Could not load PocketGenerator since its json does not represent a CompoundTag!");
-		}
-		return PocketGenerator.deserialize((CompoundTag) tag);
 	}
 
-	private PocketTemplate loadPocketTemplate(Tag tag) {
+	private PocketTemplate loadPocketTemplate(CompoundTag tag) {
-		if (tag == null || tag.getType() != NbtType.COMPOUND) {
-			throw new RuntimeException("Could not load Schematic since its json does not represent a CompoundTag!");
-		}
 		try {
-			return new PocketTemplate(Schematic.fromTag((CompoundTag) tag));
+			return new PocketTemplate(Schematic.fromTag(tag));
 		} catch (Exception e) {
 			throw new RuntimeException("Error loading " + tag.toString(), e);
 		}

src/main/java/org/dimdev/dimdoors/pockets/modifier/DimensionalDoorModifier.java

@@ -49,7 +49,6 @@ public class DimensionalDoorModifier implements LazyCompatibleModifier {
 	private Equation yEquation;
 	private Equation zEquation;
 
-
 	@Override
 	public Modifier fromTag(CompoundTag tag) {
 		String facingString = tag.getString("facing");
@@ -67,7 +66,7 @@ public class DimensionalDoorModifier implements LazyCompatibleModifier {
 
 		if (tag.getType("rift_data") == NbtType.STRING) {
 			doorDataReference = tag.getString("rift_data");
-			doorData = (CompoundTag) PocketLoader.getInstance().readNbtFromJson(doorDataReference);
+			doorData = (CompoundTag) PocketLoader.getInstance().getRiftDataTag(doorDataReference);
 		}
 		else if (tag.getType("rift_data") == NbtType.COMPOUND) doorData = tag.getCompound("rift_data");
 

src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java

@@ -32,7 +32,7 @@ public class RiftDataModifier implements Modifier {
 	public Modifier fromTag(CompoundTag tag) {
 		if (tag.getType("rift_data") == NbtType.STRING) {
 			doorDataReference = tag.getString("rift_data");
-			doorData = (CompoundTag) PocketLoader.getInstance().readNbtFromJson(doorDataReference);
+			doorData = (CompoundTag) PocketLoader.getInstance().getRiftDataTag(doorDataReference);
 		}
 		else if (tag.getType("rift_data") == NbtType.COMPOUND) doorData = tag.getCompound("rift_data");
 

src/main/java/org/dimdev/dimdoors/world/ModDimensions.java

@@ -43,10 +43,6 @@ public final class ModDimensions {
         return Objects.equals(type, PERSONAL) || Objects.equals(type, PUBLIC) || Objects.equals(type, DUNGEON);
     }
 
-    public static boolean isLimbo(StructureWorldAccess world) {
-        return world != null && world.getDimension() == LIMBO_TYPE;
-    }
-
     public static boolean isLimboDimension(World world) {
         return world != null && world.getRegistryKey().equals(LIMBO);
     }

src/main/java/org/dimdev/dimdoors/world/feature/gateway/LimboGateway.java

@@ -39,7 +39,7 @@ public enum LimboGateway implements Gateway {
 
     @Override
     public boolean isLocationValid(StructureWorldAccess world, BlockPos pos) {
-        return ModDimensions.isLimbo(world);
+        return ModDimensions.isLimboDimension(world.toServerWorld());
     }
 
     private void placePortal(StructureWorldAccess world, BlockPos pos, Direction facing) {

src/main/java/org/dimdev/dimdoors/world/pocket/type/Pocket.java

@@ -31,7 +31,7 @@ public class Pocket extends AbstractPocket<Pocket> implements AddonProvider {
 
 	private final Map<Identifier, PocketAddon> addons = new HashMap<>();
 	private int range = -1;
-	public BlockBox box; // TODO: make protected
+	private BlockBox box; // TODO: make protected
 	public VirtualLocation virtualLocation;
 
 	public Pocket(int id, RegistryKey<World> world, int x, int z) {
@@ -42,7 +42,6 @@ public class Pocket extends AbstractPocket<Pocket> implements AddonProvider {
 	}
 
 	protected Pocket() {
-
 	}
 
 	public boolean hasAddon(Identifier id) {
@@ -182,6 +181,10 @@ public class Pocket extends AbstractPocket<Pocket> implements AddonProvider {
 		return new PocketBuilder(AbstractPocketType.POCKET);
 	}
 
+	protected void setBox(BlockBox box) {
+		this.box = box;
+	}
+
 	// TODO: flesh this out a bit more, stuff like box() makes little sense in how it is implemented atm
 	public static class PocketBuilder<P extends PocketBuilder<P, T>, T extends Pocket> extends AbstractPocketBuilder<P, T> {
 		private final Map<Identifier, PocketAddon.PocketBuilderAddon<?>> addons = new HashMap<>();
@@ -248,7 +251,7 @@ public class Pocket extends AbstractPocket<Pocket> implements AddonProvider {
 			T instance = super.build();
 
 			instance.setRange(range);
-			instance.box = BlockBox.create(origin.getX(), origin.getY(), origin.getZ(), origin.getX() + size.getX(), origin.getY() + size.getY(), origin.getZ() + size.getZ());
+			instance.setBox(BlockBox.create(origin.getX(), origin.getY(), origin.getZ(), origin.getX() + size.getX(), origin.getY() + size.getY(), origin.getZ() + size.getZ()));
 			instance.virtualLocation = virtualLocation;
 
 			addons.values().forEach(addon -> addon.apply(instance));

src/main/java/org/dimdev/dimdoors/world/pocket/type/addon/DyeableAddon.java

@@ -27,8 +27,8 @@ public class DyeableAddon implements PocketAddon {
 	private int count = 0;
 
 	private static int amountOfDyeRequiredToColor(Pocket pocket) {
-		int outerVolume = pocket.box.getBlockCountX() * pocket.box.getBlockCountY() * pocket.box.getBlockCountZ();
+		int outerVolume = pocket.getBox().getBlockCountX() * pocket.getBox().getBlockCountY() * pocket.getBox().getBlockCountZ();
-		int innerVolume = (pocket.box.getBlockCountX() - 5) * (pocket.box.getBlockCountY() - 5) * (pocket.box.getBlockCountZ() - 5);
+		int innerVolume = (pocket.getBox().getBlockCountX() - 5) * (pocket.getBox().getBlockCountY() - 5) * (pocket.getBox().getBlockCountZ() - 5);
 
 		return Math.max((outerVolume - innerVolume) / BLOCKS_PAINTED_PER_DYE, 1);
 	}

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/broken_pillars.json

@@ -9,12 +9,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/buggy_top_entry.json

@@ -9,12 +9,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/cage_monolithless.json

@@ -18,7 +18,7 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     }
   ],
   "offset_x": "1",

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/chain_crossing.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/chain_t.json

@@ -8,17 +8,17 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/collapsed_single_tunnel.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/crumbled_hall.json

@@ -8,22 +8,22 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [3],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/decaying_chain_tunnel.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/door_totem_ruins.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1,2,3,4,5,6,7,8],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/exit_cube.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/escape"
+      "rift_data": "dimdoors:rift_data/escape"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/exit_ruins_with_hidden_door.json

@@ -8,17 +8,17 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/escape"
+      "rift_data": "dimdoors:rift_data/escape"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/honey_parkour.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/lantredom.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:relative",

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/lantredom_end.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:relative",

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/lantredom_red.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:relative",

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/line_walker.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/mob_prison.json

@@ -8,17 +8,17 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/monolith_cage.json

@@ -8,7 +8,7 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/party.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/returning_eye.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/rising_hand.json

@@ -8,7 +8,7 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/river_road_twin_bridges.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/silverfish_bridge.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/smile_6.json

@@ -18,7 +18,7 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/stone_brick_bridge.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/trap_rib_tunnel.json

@@ -9,12 +9,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/upwards_pillars.json

@@ -8,12 +8,12 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/upwards_t_treasure.json

@@ -9,17 +9,17 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/waiting_room.json

@@ -8,7 +8,7 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     }
   ]
 }

src/main/resources/resourcepacks/default_pockets/data/dimdoors/pockets/generators/custom/white_fabric_maze.json

@@ -9,17 +9,17 @@
     {
       "type": "dimdoors:rift_data",
       "ids": [0],
-      "rift_data": "rift_data/pocket_entrance"
+      "rift_data": "dimdoors:rift_data/pocket_entrance"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [1],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     },
     {
       "type": "dimdoors:rift_data",
       "ids": [2],
-      "rift_data": "rift_data/available_link"
+      "rift_data": "dimdoors:rift_data/available_link"
     }
   ]
 }