mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Block -> executable

Browse Source
This commit is contained in:
Astrash
2023-07-24 17:30:37 +10:00
parent d98238c262
commit be444f75b7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java
+6 -6
View File
@@ -51,7 +51,7 @@ import com.dfsek.terra.api.world.WritableWorld;
public class StructureScript implements Structure, Keyed<StructureScript> { public class StructureScript implements Structure, Keyed<StructureScript> {
private static final Logger LOGGER = LoggerFactory.getLogger(StructureScript.class); private static final Logger LOGGER = LoggerFactory.getLogger(StructureScript.class);
private final Executable block; private final Executable executable;
private final RegistryKey id; private final RegistryKey id;
private final String profile; private final String profile;
@@ -124,7 +124,7 @@ public class StructureScript implements Structure, Keyed<StructureScript> {
parser.ignoreFunction("debugBlock"); parser.ignoreFunction("debugBlock");
} }
block = parser.parse(); executable = parser.parse();
this.platform = platform; this.platform = platform;
} }
@@ -132,21 +132,21 @@ public class StructureScript implements Structure, Keyed<StructureScript> {
@SuppressWarnings("try") @SuppressWarnings("try")
public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) { public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
platform.getProfiler().push(profile); platform.getProfiler().push(profile);
boolean result = applyBlock(new TerraImplementationArguments(location, rotation, random, world, 0)); boolean result = execute(new TerraImplementationArguments(location, rotation, random, world, 0));
platform.getProfiler().pop(profile); platform.getProfiler().pop(profile);
return result; return result;
} }
public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation, int recursions) { public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation, int recursions) {
platform.getProfiler().push(profile); platform.getProfiler().push(profile);
boolean result = applyBlock(new TerraImplementationArguments(location, rotation, random, world, recursions)); boolean result = execute(new TerraImplementationArguments(location, rotation, random, world, recursions));
platform.getProfiler().pop(profile); platform.getProfiler().pop(profile);
return result; return result;
} }
private boolean applyBlock(TerraImplementationArguments arguments) { private boolean execute(TerraImplementationArguments arguments) {
try { try {
return block.execute(arguments); return executable.execute(arguments);
} catch(RuntimeException e) { } catch(RuntimeException e) {
LOGGER.error("Failed to generate structure at {}", arguments.getOrigin(), e); LOGGER.error("Failed to generate structure at {}", arguments.getOrigin(), e);
return false; return false;