mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-03 00:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

add error messages for invalid noise functions

Browse Source
This commit is contained in:
dfsek 2022-01-18 21:39:22 -07:00
parent eea72a8470
commit 754b06881d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunctionBuilder.java
View File

@ -12,6 +12,7 @@ import com.dfsek.terra.api.noise.NoiseSampler;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -42,10 +43,11 @@ public class SamplerFunctionBuilder implements FunctionBuilder<SamplerFunction>
if(argumentList.size() == 3) { // 2D if(argumentList.size() == 3) { // 2D
if(arg instanceof StringConstant constant) { if(arg instanceof StringConstant constant) {
NoiseSampler sampler = samplers2d.get(constant.getConstant()).getSampler(); NoiseSampler sampler = Objects.requireNonNull(samplers2d.get(constant.getConstant()),
"No such 2D noise function " + constant.getConstant()).getSampler();
function = s -> sampler; function = s -> sampler;
} else { } else {
function = s -> samplers2d.get(s.get()).getSampler(); function = s -> Objects.requireNonNull(samplers2d.get(s.get()), "No such 2D noise function " + s.get()).getSampler();
} }
return new SamplerFunction((Returnable<String>) argumentList.get(0), return new SamplerFunction((Returnable<String>) argumentList.get(0),
(Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(1),
@ -56,10 +58,11 @@ public class SamplerFunctionBuilder implements FunctionBuilder<SamplerFunction>
position); position);
} else { // 3D } else { // 3D
if(arg instanceof StringConstant constant) { if(arg instanceof StringConstant constant) {
NoiseSampler sampler = samplers3d.get(constant.getConstant()).getSampler(); NoiseSampler sampler = Objects.requireNonNull(samplers3d.get(constant.getConstant()),
"No such 3D noise function " + constant.getConstant()).getSampler();
function = s -> sampler; function = s -> sampler;
} else { } else {
function = s -> samplers3d.get(s.get()).getSampler(); function = s -> Objects.requireNonNull(samplers3d.get(s.get()), "No such 3D noise function " + s.get()).getSampler();
} }
return new SamplerFunction((Returnable<String>) argumentList.get(0), return new SamplerFunction((Returnable<String>) argumentList.get(0),
(Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(1),