Update pockets and fix registry recursion bug

src/main/java/org/dimdev/dimdoors/shared/rifts/registry/RiftRegistry.java

@@ -26,6 +26,7 @@ public class RiftRegistry extends WorldSavedData {
     private static final String SUBREGISTRY_DATA_NAME = DimDoors.MODID + "_rifts";
 
     protected Map<Integer, RiftSubregistry> subregistries = new HashMap<>();
+    private static RiftRegistry riftRegistry = null; // For use by RiftSubregistry only
     protected DefaultDirectedGraph<RegistryVertex, DefaultEdge> graph = new DefaultDirectedGraph<>(DefaultEdge.class);
     // TODO: add methods that automatically add vertices/edges and mark appropriate subregistries as dirty
 
@@ -41,9 +42,9 @@ public class RiftRegistry extends WorldSavedData {
 
     // <editor-fold defaultstate="collapsed" desc="Code for reading/writing/getting the registry">
 
+
     public static class RiftSubregistry extends WorldSavedData {
         private int dim;
-        RiftRegistry riftRegistry = (RiftRegistry) WorldUtils.getWorld(0).getMapStorage().getOrLoadData(RiftRegistry.class, DATA_NAME);
 
         public RiftSubregistry() {
             super(SUBREGISTRY_DATA_NAME);
@@ -152,9 +153,12 @@ public class RiftRegistry extends WorldSavedData {
 
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
+        riftRegistry = this;
+
         // Trigger the subregistry reading code for all dimensions. It would be better if there was some way of forcing
-        // them to be read from somewhere else, since this is technically more than just reading the NBT. This has to be
+        // them to be read from somewhere else, since this is technically more than just reading the NBT and can cause
-        // done last since links are only in the subregistries.
+        // problems with recursion without riftRegistry. This has to be done last since links are only
+        // in the subregistries.
         // TODO: If non-dirty but new WorldSavedDatas aren't automatically saved, then create the subregistries here
         // TODO: rather then in the markSubregistryDirty method.
         // TODO: try to get rid of this code:

src/main/java/org/dimdev/dimdoors/shared/tools/PocketSchematicGenerator.java

@@ -99,16 +99,16 @@ public final class PocketSchematicGenerator {
                     ModBlocks.ANCIENT_FABRIC.getDefaultState(), // outer wall
                     ModBlocks.FABRIC.getDefaultState(), // inner wall
                     ModBlocks.DIMENSIONAL_DOOR, // door
-                    PocketExitDestination.builder().build(),
+                    PocketExitDestination.builder().build(),// exit rift destination
-                    1)); // exit rift destination
+                    1)); // TODO: pass destination rather than just chaos weight
             schematics.add(generatePocketSchematic(
                     "private_pocket", // base name
                     pocketSize, // size
                     ModBlocks.ANCIENT_FABRIC.getDefaultState().withProperty(BlockFabricAncient.COLOR, EnumDyeColor.WHITE), // outer wall
                     ModBlocks.FABRIC.getDefaultState().withProperty(BlockFabricAncient.COLOR, EnumDyeColor.WHITE), // inner wall
                     ModBlocks.PERSONAL_DIMENSIONAL_DOOR, // door
-                    PrivatePocketExitDestination.builder().build(),
+                    PrivatePocketExitDestination.builder().build(),// exit rift destination
-                    0)); // exit rift destination
+                    0));
         }
         return schematics;
     }

src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPersonalPocket.java

@@ -14,6 +14,7 @@ public class WorldProviderPersonalPocket extends WorldProviderPocket {
     @Override
     public void init() {
         super.init();
+        hasSkyLight = false; // TODO: figure out why relighting takes so long with private pockets only...
         biomeProvider = new BiomeProviderSingle(ModBiomes.WHITE_VOID);
     }
 

src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPocket.java

@@ -15,8 +15,7 @@ public abstract class WorldProviderPocket extends WorldProvider {
 
     @Override
     public void init() {
-        // TODO: save pocket registry nbt here? (see WorldProviderEnd)
+        hasSkyLight = true;
-        hasSkyLight = true; // TODO: this is only a temporary fix
         generateLightBrightnessTable();
         DimDoors.proxy.setCloudRenderer(this, new CloudRenderBlank());
     }

src/main/resources/assets/dimdoors/models/block/fabric_black.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_black" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_blue.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_blue" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_brown.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_brown" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_cyan.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_cyan" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_gray.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_gray" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_green.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_green" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_light_blue.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_light_blue" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_lime.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_lime" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_magenta.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_magenta" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_orange.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_orange" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_pink.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_pink" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_purple.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_purple" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_red.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_red" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_silver.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_silver" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_white.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_white" }
 }

src/main/resources/assets/dimdoors/models/block/fabric_yellow.json

@@ -1,4 +1,4 @@
 {
-  "parent": "block/cube_all",
+  "parent": "dimdoors:block/fullbright",
   "textures": { "all": "dimdoors:blocks/fabric_yellow" }
 }