9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-04 15:41:30 +00:00
This commit is contained in:
Daniel Mills
2020-08-09 01:24:58 -04:00
parent e0714637ff
commit d3a4b0451d
11 changed files with 75 additions and 19 deletions

View File

@@ -116,7 +116,7 @@ public abstract class ContextualChunkGenerator extends ChunkGenerator implements
public IrisDimension loadDimension(String i)
{
return getData().getDimensionLoader().load(i);
return (getData() == null ? Iris.globaldata : getData()).getDimensionLoader().load(i);
}
public IrisGenerator loadGenerator(String i)

View File

@@ -70,6 +70,8 @@ public abstract class DimensionChunkGenerator extends ContextualChunkGenerator
dimensionName = "error-missing-dimension";
fail(new RuntimeException("Missing dimension folder/file in " + folder.getAbsolutePath()));
}
getData().preferFolder(getDimension().getLoadFile().getParentFile().getParentFile().getName());
}
public IrisDimension getDimension()

View File

@@ -174,6 +174,7 @@ public class IrisChunkGenerator extends CeilingChunkGenerator implements IrisCon
public void onHotloaded()
{
CNG.creates = 0;
getData().dump();
onHotload();
}
@@ -220,6 +221,11 @@ public class IrisChunkGenerator extends CeilingChunkGenerator implements IrisCon
@Override
public boolean shouldGenerateStructures()
{
if(!isInitialized())
{
return false;
}
return getDimension().isVanillaStructures();
}
}