cluenap

src/main/java/carpet/helpers/FeatureGenerator.java

@@ -142,7 +142,7 @@ public class FeatureGenerator
                 findFirst().map(Map.Entry::getValue).orElse(null);
     }
 
-    synchronized public static <T extends FeatureConfig> StructureStart shouldStructureStartAt(ServerWorld world, BlockPos pos, StructureFeature<T> structure, boolean computeBox)
+    public static <T extends FeatureConfig> StructureStart shouldStructureStartAt(ServerWorld world, BlockPos pos, StructureFeature<T> structure, boolean computeBox)
     {
         long seed = world.getSeed();
         ChunkGenerator generator = world.getChunkManager().getChunkGenerator();

src/main/java/carpet/script/argument/FileArgument.java

@@ -184,8 +184,7 @@ public class FileArgument
                 }
                 catch (FileSystemNotFoundException | IOException fsnfe)
                 {
-                    return null; // undr java 16 no file throws IOException - will take care of it later
+                    throw new ThrowStatement("Unable to open zip file: "+zipContainer, Throwables.IO_EXCEPTION);
-                    //throw new ThrowStatement("Unable to open zip file: "+zipContainer, Throwables.IO_EXCEPTION);
                 }
             }
             return zfs.getPath(resource+(isFolder?"/":type.extension));