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

Merge branch 'master' of https://github.com/gnembon/fabric-carpet

Browse Source
This commit is contained in:
gnembon committed 2020-09-07 15:20:07 -03:00
2 parents 7daac70f93 26169f042e
commit 6bf1d46c50
5 files changed
+63 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetExpression.java
+24 -3
View File
@@ -3382,7 +3382,7 @@ public class CarpetExpression
return (c_, t_) -> Value.TRUE;
});
this.expr.addLazyFunction("logger", 1, (c, t, lv) ->
this.expr.addLazyFunction("logger", -1, (c, t, lv) ->
{
//CarpetSettings.LOG.error("Standard Structures:");
//CarpetSettings.LOG.error(Registry.STRUCTURE_FEATURE.getIds().stream().map(i -> "`'"+NBTSerializableValue.nameFromRegistryId(i)+"'`").sorted(). collect(Collectors.joining(", ")));
@@ -3400,8 +3400,29 @@ public class CarpetExpression
//CarpetSettings.LOG.error(FeatureGenerator.featureMap.keySet().stream().map(i -> "`'"+i+"'`").sorted().collect(Collectors.joining(", ")));
//CarpetSettings.LOG.error(Registry.ENTITY_TYPE.getIds().stream().sorted().map(ValueConversions::simplify).collect(Collectors.joining("`, `")));
Value res = lv.get(0).evalValue(c);
CarpetSettings.LOG.error(res.getString());
Value res;
if(lv.size()==1){
res = lv.get(0).evalValue(c);
CarpetSettings.LOG.info(res.getString());
}
else if(lv.size()==2){
String level = lv.get(0).evalValue(c).toString();
res = lv.get(1).evalValue(c);
switch(level){
case "error":CarpetSettings.LOG.error(res.getString()); break;
case "warn":CarpetSettings.LOG.warn(res.getString()); break;
case "debug":CarpetSettings.LOG.debug(res.getString()); break;
case "fatal":CarpetSettings.LOG.fatal(res.getString()); break;
case "info":CarpetSettings.LOG.info(res.getString()); break;
default: throw new InternalExpressionException("Unknown error type: "+level);
}
}
else throw new InternalExpressionException("logger only takes 1 or 2 arguments");
return (_c, _t) -> res; // pass through for variables
});
src/main/java/carpet/script/value/EntityValue.java
+3
View File
@@ -343,6 +343,7 @@ public class EntityValue extends Value
put("sneaking", (e, a) -> e.isSneaking()?Value.TRUE:Value.FALSE);
put("sprinting", (e, a) -> e.isSprinting()?Value.TRUE:Value.FALSE);
put("swimming", (e, a) -> e.isSwimming()?Value.TRUE:Value.FALSE);
put("air", (e, a) -> return new NumericValue(e.getAir()));
put("persistence", (e, a) -> {
if (e instanceof MobEntity) return new NumericValue(((MobEntity) e).isPersistent());
return Value.NULL;
@@ -1107,6 +1108,8 @@ public class EntityValue extends Value
if(e instanceof PlayerEntity) ((PlayerEntity) e).getHungerManager().setSaturationLevelClient((float)NumericValue.asNumber(v).getLong());
});
put("air", (e, v) -> e.setAir(NumericValue.asNumber(v).getLong()));
put("breaking_progress", (e, a) -> {
if (e instanceof ServerPlayerEntity)
{