mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 18:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-11-27 19:26:41 -05:00
parent ad01a157ce
commit b6fdde403a
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.volmit</groupId> <groupId>com.volmit</groupId>
<artifactId>Iris</artifactId> <artifactId>Iris</artifactId>
<version>1.1.1</version> <version>1.1.3</version>
<name>Iris</name> <name>Iris</name>
<properties> <properties>
<skip.copy>false</skip.copy> <skip.copy>false</skip.copy>

8
src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java
View File

@ -50,8 +50,12 @@ public class IrisTerrainActuator extends EngineAssignedActuator<BlockData>
continue; continue;
} }
for(i = hf; i >= b; i--) for(i = hf; i >= b; i--) {
{ if (i >= h.getHeight())
{
continue;
}
if(i == b && getDimension().isBedrock()) if(i == b && getDimension().isBedrock())
{ {
h.set(xf, i, zf, BEDROCK); h.set(xf, i, zf, BEDROCK);

5
src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java
View File

@ -23,6 +23,11 @@ public class IrisRavineModifier extends EngineAssignedModifier<BlockData> {
@Override @Override
public void onModify(int x, int z, Hunk<BlockData> output) { public void onModify(int x, int z, Hunk<BlockData> output) {
if(!getDimension().isRavines())
{
return;
}
PrecisionStopwatch p = PrecisionStopwatch.start(); PrecisionStopwatch p = PrecisionStopwatch.start();
generateRavines(rng, Math.floorDiv(x, 16), Math.floorDiv(z, 16), output); generateRavines(rng, Math.floorDiv(x, 16), Math.floorDiv(z, 16), output);
getEngine().getMetrics().getRavine().put(p.getMilliseconds()); getEngine().getMetrics().getRavine().put(p.getMilliseconds());

22
src/main/java/com/volmit/iris/manager/IrisProject.java
View File

@ -58,11 +58,12 @@ public class IrisProject
try try
{ {
File f = d.getLoader().getDataFolder(); File f = d.getLoader().getDataFolder();
boolean foundWork = false;
for(File i : f.listFiles()) for(File i : f.listFiles())
{ {
if(i.getName().endsWith(".code-workspace")) if(i.getName().endsWith(".code-workspace"))
{ {
foundWork = true;
sender.sendMessage("Updating Workspace..."); sender.sendMessage("Updating Workspace...");
J.a(() -> J.a(() ->
{ {
@ -78,6 +79,25 @@ public class IrisProject
break; break;
} }
} }
if(!foundWork)
{
File ff = new File(d.getLoader().getDataFolder(), d.getLoadKey() + ".code-workspace");
Iris.warn("Project missing code-workspace: " + ff.getAbsolutePath() + " Re-creating code workspace.");
try
{
IO.writeAll(ff, createCodeWorkspaceConfig());
}
catch(IOException e1)
{
e1.printStackTrace();
}
sender.sendMessage("Updating Workspace...");
updateWorkspace();
sender.sendMessage("Workspace Updated");
}
} }
catch(Throwable e) catch(Throwable e)