The engine is the framework

This commit is contained in:
Daniel Mills
2021-08-08 04:53:14 -04:00
parent 70d8b8a88a
commit f50ac49ede
42 changed files with 289 additions and 543 deletions

View File

@@ -21,8 +21,7 @@ package com.volmit.iris.engine.scripting;
import com.volmit.iris.engine.framework.Engine;
import org.apache.bsf.BSFManager;
public interface EngineExecutionEnvironment
{
public interface EngineExecutionEnvironment {
Engine getEngine();
IrisScriptingAPI getAPI();
@@ -33,8 +32,7 @@ public interface EngineExecutionEnvironment
Object evaluate(String script);
default void close()
{
default void close() {
}
}

View File

@@ -23,7 +23,6 @@ import com.volmit.iris.core.project.loader.IrisData;
import com.volmit.iris.core.project.loader.IrisRegistrant;
import com.volmit.iris.engine.IrisComplex;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineFramework;
import com.volmit.iris.engine.object.biome.IrisBiome;
import com.volmit.iris.engine.object.dimensional.IrisDimension;
import com.volmit.iris.engine.object.noise.IrisExpression;
@@ -41,70 +40,53 @@ public class IrisScriptingAPI {
private Location location;
private Entity entity;
public IrisScriptingAPI(Engine engine)
{
public IrisScriptingAPI(Engine engine) {
this.engine = engine;
}
public IrisData getData()
{
public IrisData getData() {
return getEngine().getData();
}
public EngineFramework getFramework()
{
return getEngine().getFramework();
public IrisComplex getComplex() {
return getEngine().getComplex();
}
public IrisComplex getComplex()
{
return getFramework().getComplex();
}
public long getSeed()
{
public long getSeed() {
return getEngine().getTarget().getWorld().seed();
}
public double expression(String expressionName, double x, double y, double z)
{
public double expression(String expressionName, double x, double y, double z) {
IrisExpression expression = getData().getExpressionLoader().load(expressionName);
return expression.evaluate(getComplex().getRng(), x, y, z);
}
public double expression(String expressionName, double x, double z)
{
public double expression(String expressionName, double x, double z) {
IrisExpression expression = getData().getExpressionLoader().load(expressionName);
return expression.evaluate(getComplex().getRng(), x, z);
}
public IrisBiome getBiomeAt(int x, int z)
{
public IrisBiome getBiomeAt(int x, int z) {
return getEngine().getSurfaceBiome(x, z);
}
public IrisDimension getDimension()
{
public IrisDimension getDimension() {
return getEngine().getDimension();
}
public void info(String log)
{
public void info(String log) {
Iris.info(log);
}
public void debug(String log)
{
public void debug(String log) {
Iris.debug(log);
}
public void warn(String log)
{
public void warn(String log) {
Iris.warn(log);
}
public void error(String log)
{
public void error(String log) {
Iris.error(log);
}
}