mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-05 23:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes?

Browse Source
This commit is contained in:
Daniel Mills
2020-01-16 03:55:54 -05:00
parent 3b90a58418
commit 75d9bf458a
11 changed files with 163 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ninja/bytecode/iris/pack/IrisBiome.java
View File

@@ -26,12 +26,17 @@ public class IrisBiome
//@builder
private static final IrisBiome OCEAN = new IrisBiome("Ocean", Biome.OCEAN)
.height(-0.5)
.height(-0.2)
.coreBiome()
.surface(MB.of(Material.SAND), MB.of(Material.SAND), MB.of(Material.SAND), MB.of(Material.CLAY), MB.of(Material.GRAVEL))
.simplexSurface();
private static final IrisBiome FROZEN_OCEAN = new IrisBiome("Frozen Ocean", Biome.FROZEN_OCEAN)
.height(-0.16)
.coreBiome()
.surface(MB.of(Material.SAND), MB.of(Material.SAND), MB.of(Material.SAND), MB.of(Material.CLAY), MB.of(Material.GRAVEL))
.simplexSurface();
private static final IrisBiome DEEP_OCEAN = new IrisBiome("Deep Ocean", Biome.DEEP_OCEAN)
.height(-0.88)
.height(-0.4)
.coreBiome()
.surface(MB.of(Material.SAND), MB.of(Material.CLAY), MB.of(Material.GRAVEL))
.simplexSurface();

16
src/main/java/ninja/bytecode/iris/pack/IrisRegion.java
View File

@@ -2,7 +2,7 @@ package ninja.bytecode.iris.pack;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.iris.util.MaxingGenerator.EnumMaxingGenerator;
import ninja.bytecode.iris.util.PolygonGenerator.EnumPolygonGenerator;
import ninja.bytecode.shuriken.collections.GList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.json.JSONObject;
@@ -11,12 +11,14 @@ public class IrisRegion
{
private String name;
private GList<IrisBiome> biomes;
private EnumMaxingGenerator<IrisBiome> gen;
private EnumPolygonGenerator<IrisBiome> gen;
private double rarity;
private boolean frozen;
private IrisBiome beach;
public IrisRegion(String name)
{
frozen = false;
this.name = name;
this.biomes = new GList<>();
rarity = 1;
@@ -28,18 +30,19 @@ public class IrisRegion
J.attempt(() ->
{
JSONObject o = Iris.getController(PackController.class).loadJSON("pack/regions/" + name + ".json");
J.attempt(() -> frozen = o.getBoolean("frozen"));
J.attempt(() -> name = o.getString("name"));
J.attempt(() -> rarity = o.getDouble("rarity"));
J.attempt(() -> beach = Iris.getController(PackController.class).getBiomeById(o.getString("beach")));
});
}
public EnumMaxingGenerator<IrisBiome> getGen()
public EnumPolygonGenerator<IrisBiome> getGen()
{
return gen;
}
public void setGen(EnumMaxingGenerator<IrisBiome> gen)
public void setGen(EnumPolygonGenerator<IrisBiome> gen)
{
this.gen = gen;
}
@@ -141,4 +144,9 @@ public class IrisRegion
return false;
return true;
}
public boolean isFrozen()
{
return frozen;
}
}