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

Deployments

Browse Source
This commit is contained in:
Daniel Mills
2020-01-23 17:42:02 -05:00
parent 64674026a6
commit ea458935f0
43 changed files with 1627 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import org.bukkit.block.Biome;
import mortar.util.text.C;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.iris.generator.layer.BiomeNoiseGenerator;
import ninja.bytecode.iris.util.MB;
import ninja.bytecode.iris.util.ObjectMode;
@@ -286,7 +285,7 @@ public class IrisBiome
{
for(String i : schematicGroups.k())
{
Iris.getController(PackController.class).loadSchematicGroup(i);
Iris.pack().loadSchematicGroup(i);
}
}
}

5
src/main/java/ninja/bytecode/iris/pack/IrisDimension.java
View File

@@ -5,7 +5,6 @@ import java.io.IOException;
import org.bukkit.World.Environment;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.shuriken.collections.KList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.json.JSONArray;
@@ -69,8 +68,8 @@ public class IrisDimension
{
int ii = i;
IrisBiome bb = Iris.getController(PackController.class).loadBiome(a.getString(ii));
Iris.getController(PackController.class).registerBiome(a.getString(ii), bb);
IrisBiome bb = Iris.pack().loadBiome(a.getString(ii));
Iris.pack().registerBiome(a.getString(ii), bb);
b.add(bb);
}
return b;

33
src/main/java/ninja/bytecode/iris/pack/IrisPack.java
View File

@@ -3,7 +3,6 @@ package ninja.bytecode.iris.pack;
import java.io.IOException;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.shuriken.collections.KList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.json.JSONArray;
@@ -15,58 +14,58 @@ public class IrisPack
private KList<String> dimensions;
private KList<String> biomes;
private KList<String> objects;
public IrisPack()
{
this.dimensions = new KList<>();
this.biomes = new KList<>();
this.objects = new KList<>();
}
public IrisPack(JSONObject o)
{
this();
fromJSON(o);
}
public void fromJSON(JSONObject o)
{
J.attempt(() -> dimensions = fromArray(o.getJSONArray("dimensions")));
J.attempt(() -> biomes = fromArray(o.getJSONArray("biomes")));
J.attempt(() -> objects = fromArray(o.getJSONArray("objects")));
}
public JSONObject toJSON()
{
JSONObject o = new JSONObject();
o.put("dimensions", toArray(dimensions));
o.put("biomes", toArray(biomes));
o.put("objects", toArray(objects));
return o;
}
public KList<String> fromArray(JSONArray ja)
{
KList<String> g = new KList<>();
for(int i = 0; i < ja.length(); i++)
{
g.add(ja.getString(i));
}
return g;
}
public JSONArray toArray(KList<String> s)
{
JSONArray ja = new JSONArray();
for(String i : s)
{
ja.put(i);
}
return ja;
}
@@ -74,14 +73,14 @@ public class IrisPack
{
for(String i : dimensions)
{
IrisDimension d = Iris.getController(PackController.class).loadDimension(i);
Iris.getController(PackController.class).registerDimension(i, d);
IrisDimension d = Iris.pack().loadDimension(i);
Iris.pack().registerDimension(i, d);
}
}
public void loadBiome(String s) throws JSONException, IOException
{
IrisBiome b = Iris.getController(PackController.class).loadBiome(s);
Iris.getController(PackController.class).registerBiome(s, b);
IrisBiome b = Iris.pack().loadBiome(s);
Iris.pack().registerBiome(s, b);
}
}

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

@@ -3,7 +3,6 @@ package ninja.bytecode.iris.pack;
import java.util.Objects;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.shuriken.collections.KList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.json.JSONObject;
@@ -33,13 +32,13 @@ public class IrisRegion
{
J.attempt(() ->
{
JSONObject o = Iris.getController(PackController.class).loadJSON("pack/regions/" + name + ".json");
JSONObject o = Iris.pack().loadJSON("pack/regions/" + name + ".json");
J.attempt(() -> name = o.getString("name"));
J.attempt(() -> ocean = Iris.getController(PackController.class).getBiomeById(o.getString("ocean")));
J.attempt(() -> beach = Iris.getController(PackController.class).getBiomeById(o.getString("beach")));
J.attempt(() -> lake = Iris.getController(PackController.class).getBiomeById(o.getString("lake")));
J.attempt(() -> lakeBeach = Iris.getController(PackController.class).getBiomeById(o.getString("shore")));
J.attempt(() -> channel = Iris.getController(PackController.class).getBiomeById(o.getString("channel")));
J.attempt(() -> ocean = Iris.pack().getBiomeById(o.getString("ocean")));
J.attempt(() -> beach = Iris.pack().getBiomeById(o.getString("beach")));
J.attempt(() -> lake = Iris.pack().getBiomeById(o.getString("lake")));
J.attempt(() -> lakeBeach = Iris.pack().getBiomeById(o.getString("shore")));
J.attempt(() -> channel = Iris.pack().getBiomeById(o.getString("channel")));
});
}