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

Massive enhancements

Browse Source
This commit is contained in:
Daniel Mills
2020-01-08 18:53:08 -05:00
parent 2a7b2343b2
commit 6179dbda8a
26 changed files with 1393 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
package ninja.bytecode.iris.spec;
package ninja.bytecode.iris.pack;
import java.lang.reflect.Field;
@@ -6,6 +6,7 @@ import org.bukkit.Material;
import org.bukkit.block.Biome;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.iris.util.MB;
import ninja.bytecode.iris.util.PolygonGenerator;
import ninja.bytecode.shuriken.collections.GList;
@@ -169,7 +170,7 @@ public class IrisBiome
for(String i : schematicGroups.k())
{
Iris.loadSchematicGroup(i);
Iris.getController(PackController.class).loadSchematicGroup(i);
}
});
}

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

@@ -1,4 +1,4 @@
package ninja.bytecode.iris.spec;
package ninja.bytecode.iris.pack;
import java.io.IOException;
import java.util.concurrent.locks.ReentrantLock;
@@ -6,6 +6,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.bukkit.World.Environment;
import ninja.bytecode.iris.Iris;
import ninja.bytecode.iris.controller.PackController;
import ninja.bytecode.shuriken.collections.GList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.execution.TaskExecutor;
@@ -75,7 +76,7 @@ public class IrisDimension
private GList<IrisBiome> biomesFromArray(JSONArray a) throws JSONException, IOException
{
GList<IrisBiome> b = new GList<>();
TaskExecutor ex= new TaskExecutor(Iris.settings.performance.compilerThreads, Iris.settings.performance.compilerPriority, "Iris Dim Compiler");
TaskExecutor ex= new TaskExecutor(Iris.settings.performance.compilerThreads, Iris.settings.performance.compilerPriority, "Iris Loader");
TaskGroup g = ex.startWork();
ReentrantLock lock = new ReentrantLock();
@@ -83,9 +84,9 @@ public class IrisDimension
{
int ii = i;
g.queue(() -> {
IrisBiome bb = Iris.loadBiome(a.getString(ii));
IrisBiome bb = Iris.getController(PackController.class).loadBiome(a.getString(ii));
lock.lock();
Iris.biomes.put(a.getString(ii), bb);
Iris.getController(PackController.class).getBiomes().put(a.getString(ii), bb);
b.add(bb);
lock.unlock();
});
@@ -118,4 +119,9 @@ public class IrisDimension
{
return name;
}
public Environment getEnvironment()
{
return environment;
}
}

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

@@ -1,8 +1,9 @@
package ninja.bytecode.iris.spec;
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.GList;
import ninja.bytecode.shuriken.execution.J;
import ninja.bytecode.shuriken.json.JSONArray;
@@ -73,14 +74,14 @@ public class IrisPack
{
for(String i : dimensions)
{
IrisDimension d = Iris.loadDimension(i);
Iris.dimensions.put(i, d);
IrisDimension d = Iris.getController(PackController.class).loadDimension(i);
Iris.getController(PackController.class).getDimensions().put(i, d);
}
}
public void loadBiome(String s) throws JSONException, IOException
{
IrisBiome b = Iris.loadBiome(s);
Iris.biomes.put(s, b);
IrisBiome b = Iris.getController(PackController.class).loadBiome(s);
Iris.getController(PackController.class).getBiomes().put(s, b);
}
}