icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 1.16

Browse Source
This commit is contained in:
gnembon committed 2020-06-04 02:40:40 -03:00
1 parent 8fe3508fdd
commit 252dc29e18
2 files changed
+5 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/utils/ShapeDispatcher.java
+3 -9
View File
@@ -177,7 +177,7 @@ public class ShapeDispatcher
protected int duration = 0;
private int key;
protected int followEntity;
protected DimensionType entityDimension;
protected RegistryKey<World> entityDimension;
protected ExpiringShape() { }
@@ -222,7 +222,7 @@ public class ShapeDispatcher
if (options.containsKey("follow"))
{
followEntity = NumericValue.asNumber(options.getOrDefault("follow", optional.get("follow"))).getInt();
entityDimension = Registry.DIMENSION_TYPE.get(new Identifier(options.get("dim").getString()));
entityDimension = RegistryKey.of(Registry.DIMENSION, new Identifier(options.get("dim").getString()));
}
}
public int getExpiry() { return duration; }
@@ -609,13 +609,7 @@ public class ShapeDispatcher
public static class DimensionParam extends StringParam
{
@Override
public Value validate(Map<String, Value> options, CarpetContext cc, Value value)
{
String dimStr = value.getString();
Optional<DimensionType> dimOp = Registry.DIMENSION_TYPE.getOrEmpty(new Identifier(dimStr));
if (!dimOp.isPresent()) throw new InternalExpressionException("Unknown dimension "+dimStr);
return value;
}
public Value validate(Map<String, Value> options, CarpetContext cc, Value value) { return value; }
@Override
public boolean appliesTo(ExpiringShape shape) { return true; }
@Override