From f34503aa3c239efb75cd8a85ac7f927b9eb94021 Mon Sep 17 00:00:00 2001 From: altrisi Date: Mon, 24 May 2021 11:21:39 +0200 Subject: [PATCH 1/5] Use primitive doubles and allow decimal exhaustion --- src/main/java/carpet/script/value/EntityValue.java | 4 +--- src/main/java/carpet/script/value/NumericValue.java | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index bf125311..606f3bdf 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -1,6 +1,5 @@ package carpet.script.value; -import carpet.CarpetServer; import carpet.fakes.BrainInterface; import carpet.fakes.EntityInterface; import carpet.fakes.ItemEntityInterface; @@ -59,7 +58,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import net.minecraft.text.LiteralText; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; @@ -1458,7 +1456,7 @@ public class EntityValue extends Value }); put("add_exhaustion", (e, v)-> { - if(e instanceof PlayerEntity) ((PlayerEntity) e).getHungerManager().addExhaustion((int) NumericValue.asNumber(v).getLong()); + if (e instanceof PlayerEntity) ((PlayerEntity) e).getHungerManager().addExhaustion(NumericValue.asNumber(v).getFloat()); }); put("absorption", (e, v) -> { diff --git a/src/main/java/carpet/script/value/NumericValue.java b/src/main/java/carpet/script/value/NumericValue.java index 27830682..627b4dfb 100644 --- a/src/main/java/carpet/script/value/NumericValue.java +++ b/src/main/java/carpet/script/value/NumericValue.java @@ -19,7 +19,7 @@ import static java.lang.Math.signum; public class NumericValue extends Value { - private final Double value; + private final double value; private Long longValue; private final static double epsilon = abs(32*((7*0.1)*10-7)); private final static MathContext displayRounding = new MathContext(12, RoundingMode.HALF_EVEN); @@ -56,8 +56,8 @@ public class NumericValue extends Value } try { - if (value.isInfinite()) return "INFINITY"; - if (value.isNaN()) return "NaN"; + if (Double.isInfinite(value)) return "INFINITY"; + if (Double.isNaN(value)) return "NaN"; if (abs(value) < epsilon) return (signum(value) < 0)?"-0":"0"; //zero rounding fails with big decimals // dobules have 16 point precision, 12 is plenty to display return BigDecimal.valueOf(value).round(displayRounding).stripTrailingZeros().toPlainString(); @@ -93,7 +93,7 @@ public class NumericValue extends Value } public float getFloat() { - return value.floatValue(); + return (float) value; } private static long floor(double double_1) { @@ -178,7 +178,7 @@ public class NumericValue extends Value NumericValue no = (NumericValue)o; if (longValue != null && no.longValue != null) return longValue.compareTo(no.longValue); - return value.compareTo(no.value); + return Double.compare(value, no.value); } return getString().compareTo(o.getString()); } From 9d9844fd5d4dcb2969d13a268464cc70310804df Mon Sep 17 00:00:00 2001 From: altrisi Date: Mon, 24 May 2021 11:41:24 +0200 Subject: [PATCH 2/5] Deprecate old boolean constructor and move existing usages --- .../java/carpet/script/CarpetEventServer.java | 4 +-- .../java/carpet/script/api/Auxiliary.java | 4 +-- .../java/carpet/script/api/Inventories.java | 2 +- .../java/carpet/script/api/Scoreboards.java | 9 ++--- .../java/carpet/script/api/WorldAccess.java | 10 +++--- .../script/command/CommandArgument.java | 3 +- .../script/language/DataStructures.java | 13 +++---- .../carpet/script/language/Threading.java | 3 +- .../carpet/script/utils/ShapeDispatcher.java | 3 +- .../java/carpet/script/utils/SystemInfo.java | 6 ++-- .../carpet/script/value/BooleanValue.java | 2 +- .../java/carpet/script/value/EntityValue.java | 34 +++++++++---------- .../carpet/script/value/NumericValue.java | 7 ++++ .../carpet/script/value/ValueConversions.java | 6 ++-- 14 files changed, 59 insertions(+), 47 deletions(-) diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 4534d667..11e5602c 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -465,7 +465,7 @@ public class CarpetEventServer public void onMountControls(ServerPlayerEntity player, float strafeSpeed, float forwardSpeed, boolean jumping, boolean sneaking) { handler.call( () -> Arrays.asList(new EntityValue(player), - new NumericValue(forwardSpeed), new NumericValue(strafeSpeed), new NumericValue(jumping), new NumericValue(sneaking) + new NumericValue(forwardSpeed), new NumericValue(strafeSpeed), BooleanValue.of(jumping), BooleanValue.of(sneaking) ), player::getCommandSource); } }; @@ -700,7 +700,7 @@ public class CarpetEventServer Arrays.asList( new EntityValue(player), StringValue.of(NBTSerializableValue.nameFromRegistryId(recipe)), - new NumericValue(fullStack) + BooleanValue.of(fullStack) ), player::getCommandSource); } }; diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index 70a34283..343c150a 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -452,7 +452,7 @@ public class Auxiliary { if (lv.get(0).isNull()) return Value.FALSE; Tag source = ((NBTSerializableValue)(NBTSerializableValue.fromValue(lv.get(0)))).getTag(); Tag match = ((NBTSerializableValue)(NBTSerializableValue.fromValue(lv.get(1)))).getTag(); - return new NumericValue(NbtHelper.matches(match, source, numParam == 2 || lv.get(2).getBoolean())); + return BooleanValue.of(NbtHelper.matches(match, source, numParam == 2 || lv.get(2).getBoolean())); }); expression.addFunction("encode_nbt", lv -> { @@ -776,7 +776,7 @@ public class Auxiliary { return; if (what.equalsIgnoreCase("boulder")) // there might be more of those WorldTools.forceChunkUpdate(locator.block.getPos(), ((CarpetContext) c).s.getWorld()); - result[0] = new NumericValue(res); + result[0] = BooleanValue.of(res); }); return result[0]; }); diff --git a/src/main/java/carpet/script/api/Inventories.java b/src/main/java/carpet/script/api/Inventories.java index a1a9af91..389bd7a6 100644 --- a/src/main/java/carpet/script/api/Inventories.java +++ b/src/main/java/carpet/script/api/Inventories.java @@ -194,7 +194,7 @@ public class Inventories { CarpetContext cc = (CarpetContext) c; NBTSerializableValue.InventoryLocator inventoryLocator = NBTSerializableValue.locateInventory(cc, lv, 0); if (inventoryLocator == null) return Value.NULL; - return new NumericValue(!inventoryLocator.inventory.isEmpty()); + return BooleanValue.of(!inventoryLocator.inventory.isEmpty()); }); //inventory_get(, ) -> item_triple diff --git a/src/main/java/carpet/script/api/Scoreboards.java b/src/main/java/carpet/script/api/Scoreboards.java index c81128a1..0b4b6743 100644 --- a/src/main/java/carpet/script/api/Scoreboards.java +++ b/src/main/java/carpet/script/api/Scoreboards.java @@ -8,6 +8,7 @@ import carpet.script.LazyValue; import carpet.script.exception.InternalExpressionException; import carpet.script.exception.ThrowStatement; import carpet.script.exception.Throwables; +import carpet.script.value.BooleanValue; import carpet.script.value.EntityValue; import carpet.script.value.ListValue; import carpet.script.value.NullValue; @@ -301,7 +302,7 @@ public class Scoreboards { Value playerVal = lv.get(0); String player = EntityValue.getPlayerNameByValue(playerVal); if(player == null) return Value.NULL; - return new NumericValue(scoreboard.clearPlayerTeam(player)); + return BooleanValue.of(scoreboard.clearPlayerTeam(player)); }); expression.addContextFunction("team_property", -1, (c, t, lv) -> @@ -357,7 +358,7 @@ public class Scoreboards { team.setDisplayName(displayName); break; case "friendlyFire": - if(!modifying) return new NumericValue(team.isFriendlyFireAllowed()); + if(!modifying) return BooleanValue.of(team.isFriendlyFireAllowed()); if(!(settingVal instanceof NumericValue)) throw new InternalExpressionException("'team_property' requires a boolean as the third argument for the property " + propertyVal.getString()); boolean friendlyFire = settingVal.getBoolean(); team.setFriendlyFireAllowed(friendlyFire); @@ -378,7 +379,7 @@ public class Scoreboards { team.setPrefix(prefix); break; case "seeFriendlyInvisibles": - if(!modifying) return new NumericValue(team.shouldShowFriendlyInvisibles()); + if(!modifying) return BooleanValue.of(team.shouldShowFriendlyInvisibles()); if(!(settingVal instanceof NumericValue)) throw new InternalExpressionException("'team_property' requires a boolean as the third argument for the property " + propertyVal.getString()); boolean seeFriendlyInvisibles = settingVal.getBoolean(); team.setShowFriendlyInvisibles(seeFriendlyInvisibles); @@ -500,7 +501,7 @@ public class Scoreboards { bossBar.setValue(((NumericValue) propertyValue).getInt()); return Value.TRUE; case "visible": - if(propertyValue == null) return new NumericValue(bossBar.isVisible()); + if(propertyValue == null) return BooleanValue.of(bossBar.isVisible()); bossBar.setVisible(propertyValue.getBoolean()); return Value.TRUE; diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index 2b22e6df..a04908ad 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -492,7 +492,7 @@ public class WorldAccess { }); expression.addContextFunction("solid", -1, (c, t, lv) -> - genericStateTest(c, "solid", lv, (s, p, w) -> new NumericValue(s.isSolidBlock(w, p)))); // isSimpleFullBlock + genericStateTest(c, "solid", lv, (s, p, w) -> BooleanValue.of(s.isSolidBlock(w, p)))); // isSimpleFullBlock expression.addContextFunction("air", -1, (c, t, lv) -> booleanStateTest(c, "air", lv, (s, p) -> s.isAir())); @@ -525,7 +525,7 @@ public class WorldAccess { genericStateTest(c, "sky_light", lv, (s, p, w) -> new NumericValue(w.getLightLevel(LightType.SKY, p)))); expression.addContextFunction("see_sky", -1, (c, t, lv) -> - genericStateTest(c, "see_sky", lv, (s, p, w) -> new NumericValue(w.isSkyVisible(p)))); + genericStateTest(c, "see_sky", lv, (s, p, w) -> BooleanValue.of(w.isSkyVisible(p)))); expression.addContextFunction("brightness", -1, (c, t, lv) -> genericStateTest(c, "brightness", lv, (s, p, w) -> new NumericValue(w.getBrightness(p)))); @@ -540,7 +540,7 @@ public class WorldAccess { { BlockPos pos = BlockArgument.findIn((CarpetContext)c, lv, 0).block.getPos(); ChunkPos chunkPos = new ChunkPos(pos); - return new NumericValue(ChunkRandom.getSlimeRandom( + return BooleanValue.of(ChunkRandom.getSlimeRandom( chunkPos.x, chunkPos.z, ((CarpetContext)c).s.getWorld().getSeed(), 987234911L @@ -593,7 +593,7 @@ public class WorldAccess { boolean force = false; if (lv.size() > locator.offset) force = lv.get(locator.offset).getBoolean(); - return new NumericValue(canHasChunk(((CarpetContext)c).s.getWorld(), new ChunkPos(pos), null, force)); + return BooleanValue.of(canHasChunk(((CarpetContext)c).s.getWorld(), new ChunkPos(pos), null, force)); }); expression.addContextFunction("generation_status", -1, (c, t, lv) -> @@ -653,7 +653,7 @@ public class WorldAccess { }); expression.addContextFunction("suffocates", -1, (c, t, lv) -> - genericStateTest(c, "suffocates", lv, (s, p, w) -> new NumericValue(s.shouldSuffocate(w, p)))); // canSuffocate + genericStateTest(c, "suffocates", lv, (s, p, w) -> BooleanValue.of(s.shouldSuffocate(w, p)))); // canSuffocate expression.addContextFunction("power", -1, (c, t, lv) -> genericStateTest(c, "power", lv, (s, p, w) -> new NumericValue(w.getReceivedRedstonePower(p)))); diff --git a/src/main/java/carpet/script/command/CommandArgument.java b/src/main/java/carpet/script/command/CommandArgument.java index 367558bc..1bb705b7 100644 --- a/src/main/java/carpet/script/command/CommandArgument.java +++ b/src/main/java/carpet/script/command/CommandArgument.java @@ -6,6 +6,7 @@ import carpet.script.CarpetScriptHost; import carpet.script.argument.FunctionArgument; import carpet.script.exception.InternalExpressionException; import carpet.script.value.BlockValue; +import carpet.script.value.BooleanValue; import carpet.script.value.EntityValue; import carpet.script.value.FormattedTextValue; import carpet.script.value.ListValue; @@ -114,7 +115,7 @@ public abstract class CommandArgument new StringArgument(), // vanilla arguments as per https://minecraft.gamepedia.com/Argument_types new VanillaUnconfigurableArgument( "bool", BoolArgumentType::bool, - (c, p) -> new NumericValue(BoolArgumentType.getBool(c, p)), false + (c, p) -> BooleanValue.of(BoolArgumentType.getBool(c, p)), false ), new FloatArgument(), new IntArgument(), diff --git a/src/main/java/carpet/script/language/DataStructures.java b/src/main/java/carpet/script/language/DataStructures.java index 8a3bec45..c472278d 100644 --- a/src/main/java/carpet/script/language/DataStructures.java +++ b/src/main/java/carpet/script/language/DataStructures.java @@ -7,6 +7,7 @@ import carpet.script.exception.InternalExpressionException; import carpet.script.exception.ThrowStatement; import carpet.script.exception.Throwables; import carpet.script.utils.ScarpetJsonDeserializer; +import carpet.script.value.BooleanValue; import carpet.script.value.ContainerValueInterface; import carpet.script.value.LContainerValue; import carpet.script.value.LazyListValue; @@ -246,7 +247,7 @@ public class DataStructures { ContainerValueInterface container = ((LContainerValue) v).getContainer(); if (container == null) return LazyValue.NULL; - Value ret = new NumericValue(container.has(((LContainerValue) v).getAddress())); + Value ret = BooleanValue.of(container.has(((LContainerValue) v).getAddress())); return (cc, tt) -> ret; } Value container = lv.get(0).evalValue(c); @@ -257,7 +258,7 @@ public class DataStructures { } if (!(container instanceof ContainerValueInterface)) return LazyValue.NULL; - Value ret = new NumericValue(((ContainerValueInterface) container).has(lv.get(lv.size()-1).evalValue(c))); + Value ret = BooleanValue.of(((ContainerValueInterface) container).has(lv.get(lv.size()-1).evalValue(c))); return (cc, tt) -> ret; }); @@ -278,7 +279,7 @@ public class DataStructures { } Value address = ((LContainerValue) container).getAddress(); Value what = lv.get(1).evalValue(c); - Value retVal = new NumericValue( (lv.size() > 2) + Value retVal = BooleanValue.of((lv.size() > 2) ? internalContainer.put(address, what, lv.get(2).evalValue(c)) : internalContainer.put(address, what)); return (cc, tt) -> retVal; @@ -294,7 +295,7 @@ public class DataStructures { } Value where = lv.get(1).evalValue(c); Value what = lv.get(2).evalValue(c); - Value retVal = new NumericValue( (lv.size()>3) + Value retVal = BooleanValue.of((lv.size()>3) ? ((ContainerValueInterface) container).put(where, what, lv.get(3).evalValue(c)) : ((ContainerValueInterface) container).put(where, what)); return (cc, tt) -> retVal; @@ -313,7 +314,7 @@ public class DataStructures { ContainerValueInterface container = ((LContainerValue) v).getContainer(); if (container == null) return LazyValue.NULL; - Value ret = new NumericValue(container.delete(((LContainerValue) v).getAddress())); + Value ret = BooleanValue.of(container.delete(((LContainerValue) v).getAddress())); return (cc, tt) -> ret; } Value container = lv.get(0).evalValue(c); @@ -324,7 +325,7 @@ public class DataStructures { } if (!(container instanceof ContainerValueInterface)) return LazyValue.NULL; - Value ret = new NumericValue(((ContainerValueInterface) container).delete(lv.get(lv.size()-1).evalValue(c))); + Value ret = BooleanValue.of(((ContainerValueInterface) container).delete(lv.get(lv.size()-1).evalValue(c))); return (cc, tt) -> ret; }); diff --git a/src/main/java/carpet/script/language/Threading.java b/src/main/java/carpet/script/language/Threading.java index 55bfdf6c..bc2c0d09 100644 --- a/src/main/java/carpet/script/language/Threading.java +++ b/src/main/java/carpet/script/language/Threading.java @@ -4,6 +4,7 @@ import carpet.script.Expression; import carpet.script.argument.FunctionArgument; import carpet.script.exception.ExitStatement; import carpet.script.exception.InternalExpressionException; +import carpet.script.value.BooleanValue; import carpet.script.value.NumericValue; import carpet.script.value.ThreadValue; import carpet.script.value.Value; @@ -62,7 +63,7 @@ public class Threading { if (!(v instanceof ThreadValue)) throw new InternalExpressionException("'task_completed' could only be used with a task value"); - return new NumericValue(((ThreadValue) v).isFinished()); + return BooleanValue.of(((ThreadValue) v).isFinished()); }); // lazy cause expr is evaluated in the same type diff --git a/src/main/java/carpet/script/utils/ShapeDispatcher.java b/src/main/java/carpet/script/utils/ShapeDispatcher.java index 85638144..ce9ad502 100644 --- a/src/main/java/carpet/script/utils/ShapeDispatcher.java +++ b/src/main/java/carpet/script/utils/ShapeDispatcher.java @@ -8,6 +8,7 @@ import carpet.script.exception.ThrowStatement; import carpet.script.exception.Throwables; import carpet.script.language.Sys; import carpet.script.value.BlockValue; +import carpet.script.value.BooleanValue; import carpet.script.value.EntityValue; import carpet.script.value.FormattedTextValue; import carpet.script.value.ListValue; @@ -1023,7 +1024,7 @@ public class ShapeDispatcher @Override public Value decode(Tag tag) { - return new NumericValue(((ByteTag) tag).getByte() > 0); + return BooleanValue.of(((ByteTag) tag).getByte() > 0); } } public static class FloatParam extends NumericParam diff --git a/src/main/java/carpet/script/utils/SystemInfo.java b/src/main/java/carpet/script/utils/SystemInfo.java index b85ae7fb..9247cf15 100644 --- a/src/main/java/carpet/script/utils/SystemInfo.java +++ b/src/main/java/carpet/script/utils/SystemInfo.java @@ -60,7 +60,7 @@ public class SystemInfo { }); put("game_difficulty", c -> StringValue.of(c.s.getMinecraftServer().getSaveProperties().getDifficulty().getName())); - put("game_hardcore", c -> new NumericValue(c.s.getMinecraftServer().getSaveProperties().isHardcore())); + put("game_hardcore", c -> BooleanValue.of(c.s.getMinecraftServer().getSaveProperties().isHardcore())); put("game_storage_format", c -> StringValue.of(c.s.getMinecraftServer().getSaveProperties().getFormatName(c.s.getMinecraftServer().getSaveProperties().getVersion()))); put("game_default_gamemode", c -> StringValue.of(c.s.getMinecraftServer().getDefaultGameMode().getName())); put("game_max_players", c -> new NumericValue(c.s.getMinecraftServer().getMaxPlayerCount())); @@ -82,7 +82,7 @@ public class SystemInfo { put("game_pack_version", c->NumericValue.of(SharedConstants.getGameVersion().getPackVersion())); put("server_ip", c -> StringValue.of(c.s.getMinecraftServer().getServerIp())); - put("server_whitelisted", c -> new NumericValue(c.s.getMinecraftServer().isEnforceWhitelist())); + put("server_whitelisted", c -> BooleanValue.of(c.s.getMinecraftServer().isEnforceWhitelist())); put("server_whitelist", c -> { MapValue whitelist = new MapValue(Collections.emptyList()); for (String s: c.s.getMinecraftServer().getPlayerManager().getWhitelistedNames()) @@ -107,7 +107,7 @@ public class SystemInfo { } return whitelist; }); - put("server_dev_environment", c-> new NumericValue(FabricLoader.getInstance().isDevelopmentEnvironment())); + put("server_dev_environment", c-> BooleanValue.of(FabricLoader.getInstance().isDevelopmentEnvironment())); put("server_mods", c -> { Map ret = new HashMap<>(); for (ModContainer mod : FabricLoader.getInstance().getAllMods()) diff --git a/src/main/java/carpet/script/value/BooleanValue.java b/src/main/java/carpet/script/value/BooleanValue.java index 19a9bc05..74dea6dd 100644 --- a/src/main/java/carpet/script/value/BooleanValue.java +++ b/src/main/java/carpet/script/value/BooleanValue.java @@ -18,7 +18,7 @@ public class BooleanValue extends NumericValue public static BooleanValue of(boolean value) { - return value?TRUE:FALSE; + return value ? TRUE : FALSE; } @Override diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index bf125311..54c74c65 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -409,7 +409,7 @@ public class EntityValue extends Value private static final Map> featureAccessors = new HashMap>() {{ //put("test", (e, a) -> a == null ? Value.NULL : new StringValue(a.getString())); - put("removed", (entity, arg) -> new NumericValue(entity.removed)); + put("removed", (entity, arg) -> BooleanValue.of(entity.removed)); put("uuid",(e, a) -> new StringValue(e.getUuidAsString())); put("id",(e, a) -> new NumericValue(e.getEntityId())); put("pos", (e, a) -> ListValue.of(new NumericValue(e.getX()), new NumericValue(e.getY()), new NumericValue(e.getZ()))); @@ -425,30 +425,30 @@ public class EntityValue extends Value put("motion_x", (e, a) -> new NumericValue(e.getVelocity().x)); put("motion_y", (e, a) -> new NumericValue(e.getVelocity().y)); put("motion_z", (e, a) -> new NumericValue(e.getVelocity().z)); - put("on_ground", (e, a) -> new NumericValue(e.isOnGround())); + put("on_ground", (e, a) -> BooleanValue.of(e.isOnGround())); put("name", (e, a) -> new StringValue(e.getName().getString())); put("display_name", (e, a) -> new FormattedTextValue(e.getDisplayName())); put("command_name", (e, a) -> new StringValue(e.getEntityName())); put("custom_name", (e, a) -> e.hasCustomName()?new StringValue(e.getCustomName().getString()):Value.NULL); put("type", (e, a) -> new StringValue(nameFromRegistryId(Registry.ENTITY_TYPE.getId(e.getType())))); - put("is_riding", (e, a) -> new NumericValue(e.hasVehicle())); - put("is_ridden", (e, a) -> new NumericValue(e.hasPassengers())); + put("is_riding", (e, a) -> BooleanValue.of(e.hasVehicle())); + put("is_ridden", (e, a) -> BooleanValue.of(e.hasPassengers())); put("passengers", (e, a) -> ListValue.wrap(e.getPassengerList().stream().map(EntityValue::new).collect(Collectors.toList()))); put("mount", (e, a) -> (e.getVehicle()!=null)?new EntityValue(e.getVehicle()):Value.NULL); - put("unmountable", (e, a) -> new NumericValue(((EntityInterface)e).isPermanentVehicle())); + put("unmountable", (e, a) -> BooleanValue.of(((EntityInterface)e).isPermanentVehicle())); // deprecated put("tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList()))); put("scoreboard_tags", (e, a) -> ListValue.wrap(e.getScoreboardTags().stream().map(StringValue::new).collect(Collectors.toList()))); put("entity_tags", (e, a) -> ListValue.wrap(e.getServer().getTagManager().getEntityTypes().getTags().entrySet().stream().filter(entry -> entry.getValue().contains(e.getType())).map(entry -> ValueConversions.of(entry.getKey())).collect(Collectors.toList()))); // deprecated - put("has_tag", (e, a) -> new NumericValue(e.getScoreboardTags().contains(a.getString()))); + put("has_tag", (e, a) -> BooleanValue.of(e.getScoreboardTags().contains(a.getString()))); - put("has_scoreboard_tag", (e, a) -> new NumericValue(e.getScoreboardTags().contains(a.getString()))); + put("has_scoreboard_tag", (e, a) -> BooleanValue.of(e.getScoreboardTags().contains(a.getString()))); put("has_entity_tag", (e, a) -> { net.minecraft.tag.Tag> tag = e.getServer().getTagManager().getEntityTypes().getTag(new Identifier(a.getString())); if (tag == null) return Value.NULL; - return new NumericValue(e.getType().isIn(tag)); + return BooleanValue.of(e.getType().isIn(tag)); }); put("yaw", (e, a)-> new NumericValue(e.yaw)); @@ -472,13 +472,13 @@ public class EntityValue extends Value Vec3d look = e.getRotationVector(); return ListValue.of(new NumericValue(look.x),new NumericValue(look.y),new NumericValue(look.z)); }); - put("is_burning", (e, a) -> new NumericValue(e.isOnFire())); + put("is_burning", (e, a) -> BooleanValue.of(e.isOnFire())); put("fire", (e, a) -> new NumericValue(e.getFireTicks())); - put("silent", (e, a)-> new NumericValue(e.isSilent())); - put("gravity", (e, a) -> new NumericValue(!e.hasNoGravity())); - put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune())); + put("silent", (e, a)-> BooleanValue.of(e.isSilent())); + put("gravity", (e, a) -> BooleanValue.of(!e.hasNoGravity())); + put("immune_to_fire", (e, a) -> BooleanValue.of(e.isFireImmune())); - put("invulnerable", (e, a) -> new NumericValue(e.isInvulnerable())); + put("invulnerable", (e, a) -> BooleanValue.of(e.isInvulnerable())); put("dimension", (e, a) -> new StringValue(nameFromRegistryId(e.world.getRegistryKey().getValue()))); // getDimId put("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height)); put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width)); @@ -492,7 +492,7 @@ public class EntityValue extends Value put("portal_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer())); put("portal_timer", (e , a) ->new NumericValue(((EntityInterface)e).getPublicNetherPortalCooldown())); // ItemEntity -> despawn timer via ssGetAge - put("is_baby", (e, a) -> (e instanceof LivingEntity)?new NumericValue(((LivingEntity) e).isBaby()):Value.NULL); + put("is_baby", (e, a) -> (e instanceof LivingEntity)?BooleanValue.of(((LivingEntity) e).isBaby()):Value.NULL); put("target", (e, a) -> { if (e instanceof MobEntity) { @@ -520,7 +520,7 @@ public class EntityValue extends Value ValueConversions.of(spe.getSpawnPointPosition()), ValueConversions.of(spe.getSpawnPointDimension()), new NumericValue(spe.getSpawnAngle()), - new NumericValue(spe.isSpawnPointSet()) // true if forced spawn point + BooleanValue.of(spe.isSpawnPointSet()) ); } return Value.NULL; @@ -530,7 +530,7 @@ public class EntityValue extends Value put("sprinting", (e, a) -> e.isSprinting()?Value.TRUE:Value.FALSE); put("swimming", (e, a) -> e.isSwimming()?Value.TRUE:Value.FALSE); put("swinging", (e, a) -> { - if (e instanceof LivingEntity) return new NumericValue(((LivingEntity) e).handSwinging); + if (e instanceof LivingEntity) return BooleanValue.of(((LivingEntity) e).handSwinging); return Value.NULL; }); @@ -542,7 +542,7 @@ public class EntityValue extends Value return StringValue.of(lang); }); put("persistence", (e, a) -> { - if (e instanceof MobEntity) return new NumericValue(((MobEntity) e).isPersistent()); + if (e instanceof MobEntity) return BooleanValue.of(((MobEntity) e).isPersistent()); return Value.NULL; }); put("hunger", (e, a) -> { diff --git a/src/main/java/carpet/script/value/NumericValue.java b/src/main/java/carpet/script/value/NumericValue.java index 27830682..de2befbf 100644 --- a/src/main/java/carpet/script/value/NumericValue.java +++ b/src/main/java/carpet/script/value/NumericValue.java @@ -227,6 +227,13 @@ public class NumericValue extends Value this.longValue = value; this.value = (double)value; } + + /** + * Creates a legacy {@link NumericValue} for a {@code boolean}. + * @param boolval The boolean to set 1 or 0 for this {@link NumericValue} + * @deprecated Use {@link BooleanValue#of(boolean)} instead + */ + @Deprecated public NumericValue(boolean boolval) { this(boolval?1L:0L); diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index af566e6f..6c9dc67f 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/src/main/java/carpet/script/value/ValueConversions.java @@ -102,7 +102,7 @@ public class ValueConversions { return ListValue.of( StringValue.of(criteria.getName()), - new NumericValue(criteria.isReadOnly()) + BooleanValue.of(criteria.isReadOnly()) ); } @@ -209,7 +209,7 @@ public class ValueConversions new BlockValue(null, world, node.getPos()), new StringValue(node.type.name().toLowerCase(Locale.ROOT)), new NumericValue(node.penalty), - new NumericValue(node.visited) + BooleanValue.of(node.visited) )); } return ListValue.wrap(nodes); @@ -243,7 +243,7 @@ public class ValueConversions } if (v instanceof Boolean) { - return new NumericValue((Boolean) v); + return BooleanValue.of((Boolean) v); } if (v instanceof UUID) { From 2b3f3768717a457662e7605de7b4cc0d4e5a68bc Mon Sep 17 00:00:00 2001 From: altrisi Date: Mon, 24 May 2021 12:00:55 +0200 Subject: [PATCH 3/5] Replace usages of deprecated ListValue::fromItemStack and remove it --- src/main/java/carpet/script/CarpetEventServer.java | 12 ++++++------ src/main/java/carpet/script/value/EntityValue.java | 4 ++-- src/main/java/carpet/script/value/ListValue.java | 7 ------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 4534d667..baae0119 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -479,7 +479,7 @@ public class CarpetEventServer //ItemStack itemstack = player.getStackInHand(enumhand); return Arrays.asList( new EntityValue(player), - ListValue.fromItemStack(itemstack), + ValueConversions.of(itemstack), StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand") ); }, player::getCommandSource); @@ -513,7 +513,7 @@ public class CarpetEventServer Vec3d vec3d = hitRes.getPos().subtract(blockpos.getX(), blockpos.getY(), blockpos.getZ()); return Arrays.asList( new EntityValue(player), - ListValue.fromItemStack(itemstack), + ValueConversions.of(itemstack), StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"), new BlockValue(null, player.getServerWorld(), blockpos), StringValue.of(enumfacing.getName()), @@ -557,7 +557,7 @@ public class CarpetEventServer { handler.call( () -> Arrays.asList( new EntityValue(player), - ListValue.fromItemStack(itemstack), + ValueConversions.of(itemstack), StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"), new BlockValue(null, player.getServerWorld(), pos) ), player::getCommandSource); @@ -602,7 +602,7 @@ public class CarpetEventServer { @Override public void onItemAction(ServerPlayerEntity player, Hand enumhand, ItemStack itemstack) { - handler.call( () -> Arrays.asList(new EntityValue(player), ListValue.fromItemStack(itemstack)), player::getCommandSource); + handler.call( () -> Arrays.asList(new EntityValue(player), ValueConversions.of(itemstack)), player::getCommandSource); } }; @@ -656,7 +656,7 @@ public class CarpetEventServer handler.call( () -> Arrays.asList( new EntityValue(player), - ListValue.fromItemStack(itemstack), + ValueConversions.of(itemstack), StringValue.of(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand") ), player::getCommandSource); } @@ -670,7 +670,7 @@ public class CarpetEventServer handler.call( () -> Arrays.asList( new EntityValue(player), - ListValue.fromItemStack(itemstack), + ValueConversions.of(itemstack), new StringValue(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand") ), player::getCommandSource); } diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index bf125311..f5520774 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -486,7 +486,7 @@ public class EntityValue extends Value put("age", (e, a) -> new NumericValue(e.age)); put("breeding_age", (e, a) -> e instanceof PassiveEntity?new NumericValue(((PassiveEntity) e).getBreedingAge()):Value.NULL); put("despawn_timer", (e, a) -> e instanceof LivingEntity?new NumericValue(((LivingEntity) e).getDespawnCounter()):Value.NULL); - put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL); + put("item", (e, a) -> (e instanceof ItemEntity)?ValueConversions.of(((ItemEntity) e).getStack()):Value.NULL); put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getCount()):Value.NULL); put("pickup_delay", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntityInterface) e).getPickupDelayCM()):Value.NULL); put("portal_cooldown", (e , a) ->new NumericValue(((EntityInterface)e).getPortalTimer())); @@ -734,7 +734,7 @@ public class EntityValue extends Value if (where == null) throw new InternalExpressionException("Unknown inventory slot: "+a.getString()); if (e instanceof LivingEntity) - return ListValue.fromItemStack(((LivingEntity)e).getEquippedStack(where)); + return ValueConversions.of(((LivingEntity)e).getEquippedStack(where)); return Value.NULL; }); diff --git a/src/main/java/carpet/script/value/ListValue.java b/src/main/java/carpet/script/value/ListValue.java index 36766093..886019d4 100644 --- a/src/main/java/carpet/script/value/ListValue.java +++ b/src/main/java/carpet/script/value/ListValue.java @@ -4,7 +4,6 @@ import carpet.script.LazyValue; import carpet.script.exception.InternalExpressionException; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.AbstractNumberTag; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.DoubleTag; @@ -75,12 +74,6 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf items = list; } - @Deprecated - public static Value fromItemStack(ItemStack itemstack) - { - return ValueConversions.of(itemstack); - } - public static Value fromTriple(double a, double b, double c) { return ListValue.of(new NumericValue(a), new NumericValue(b), new NumericValue(c)); From 05ff870d0bbeaacdc8cd00699a6ec1b1a0e6c239 Mon Sep 17 00:00:00 2001 From: altrisi Date: Mon, 24 May 2021 12:40:20 +0200 Subject: [PATCH 4/5] Allow static methods for Scarpet Functions What was I thinking? --- .../carpet/script/annotation/AnnotationParser.java | 12 +++++------- .../carpet/script/annotation/ScarpetFunction.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/carpet/script/annotation/AnnotationParser.java b/src/main/java/carpet/script/annotation/AnnotationParser.java index 987ecb0c..a2c759c6 100644 --- a/src/main/java/carpet/script/annotation/AnnotationParser.java +++ b/src/main/java/carpet/script/annotation/AnnotationParser.java @@ -84,9 +84,8 @@ public final class AnnotationParser *

There is a set of requirements for the class and its methods:

*
    *
  • Class must be concrete. That is, no interfaces or abstract classes should be passed
    • - *
  • Class must have the default constructor (or an equivalent) available. That is done in order to not need the {@code static} modifier in every method, making them faster to - * code and simpler to look at.
    • - *
  • Annotated methods must not be {@code static}. See claim above
    • + *
  • Class must have the default constructor (or an equivalent) available. That is done in order to not need the {@code static} modifier in every + * method, making them faster to code and simpler to look at.
    • *
  • Annotated methods must not throw checked exceptions. They can throw regular {@link RuntimeException}s (including but not limited to * {@link InternalExpressionException}). * Basically, it's fine as long as you don't add a {@code throws} declaration to your methods.
    • @@ -121,9 +120,7 @@ public final class AnnotationParser { if (!method.isAnnotationPresent(ScarpetFunction.class)) continue; - // Checks - if (Modifier.isStatic(method.getModifiers())) - throw new IllegalArgumentException("Annotated method '" + method.getName() + "', provided in '" + clazz + "' must not be static"); + if (method.getExceptionTypes().length != 0) throw new IllegalArgumentException("Annotated method '" + method.getName() +"', provided in '"+clazz+"' must not declare checked exceptions"); @@ -212,7 +209,8 @@ public final class AnnotationParser try { MethodHandle tempHandle = MethodHandles.publicLookup().unreflect(method).asFixedArity().asSpreader(Object[].class, this.methodParamCount); - this.handle = tempHandle.asType(tempHandle.type().changeReturnType(Object.class)).bindTo(instance); + tempHandle = tempHandle.asType(tempHandle.type().changeReturnType(Object.class)); + this.handle = Modifier.isStatic(method.getModifiers()) ? tempHandle : tempHandle.bindTo(instance); } catch (IllegalAccessException e) { throw new IllegalArgumentException(e); diff --git a/src/main/java/carpet/script/annotation/ScarpetFunction.java b/src/main/java/carpet/script/annotation/ScarpetFunction.java index 80aa94de..466bda7e 100644 --- a/src/main/java/carpet/script/annotation/ScarpetFunction.java +++ b/src/main/java/carpet/script/annotation/ScarpetFunction.java @@ -29,7 +29,7 @@ import carpet.script.value.Value; * {@link AnnotationParser#parseFunctionClass(Class)} ONCE. The provided {@link Class} must be concrete and provide the default constructor or an * equivalent to it.

    * - *

    Methods annotated with this annotation must not be static and must not declare throwing any checked exceptions.

    + *

    Methods annotated with this annotation must not declare throwing any checked exceptions.

    * *

    If one of the method's parameters is {@link Context}, Carpet will pass the actual {@link Context} of the expression to the * method. If one of the method's parameters is {@link Context.Type}, Carpet will pass the Context Type the function was called inside. That From adee06ad3f5e7fd780837b23cfcc566a98dfad83 Mon Sep 17 00:00:00 2001 From: altrisi Date: Mon, 24 May 2021 14:51:14 +0200 Subject: [PATCH 5/5] Mention custom converters in Param javadoc, make a few things final and remove commented out LazyValue provider --- .../java/carpet/script/annotation/Param.java | 36 +++---------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/src/main/java/carpet/script/annotation/Param.java b/src/main/java/carpet/script/annotation/Param.java index 9d28ea1f..343189e7 100644 --- a/src/main/java/carpet/script/annotation/Param.java +++ b/src/main/java/carpet/script/annotation/Param.java @@ -133,42 +133,14 @@ public interface Param /** *

    Class that holds the actual converters and converter getting logic for those annotated types and things.

    * - *

    It also holds the registry for strict {@link ValueConverter}s.

    + *

    It also holds the registry for strict and custom {@link ValueConverter}s.

    * * @see #registerStrictConverter(Class, boolean, ValueConverter) + * @see #registerCustomConverterFactory(BiFunction) * */ public static final class Params { - /** - *

    A {@link ValueConverter} that outputs the given {@link LazyValue} when running {@link #checkAndConvert(Iterator, Context, Context.Type)}, and - * throws {@link UnsupportedOperationException} when trying to convert a {@link Value} directly.

    - * - *

    Public in order to allow custom {@link ValueConverter} to check whether values should be evaluated while testing conditions.

    - */ - /*public static final ValueConverter LAZY_VALUE_IDENTITY = new ValueConverter() - { // No longer possible - - @Override - public LazyValue convert(Value val) - { - throw new UnsupportedOperationException( - "Called convert() with a Value in LazyValue identity, where only evalAndConvert is supported"); - } - - @Override - public LazyValue checkAndConvert(Iterator lazyValueIterator, Context c, Context.Type theLazyT) - { - return lazyValueIterator.hasNext() ? lazyValueIterator.next() : null; - } - - @Override - public String getTypeName() - { - return "something"; - } - };*/ - /** *

    A {@link ValueConverter} that outputs the {@link Context} in which the function has been called, and throws {@link UnsupportedOperationException} when trying to convert a {@link Value} * directly.

    @@ -228,7 +200,7 @@ public interface Param * *

    Stored as {@code , Converter>}

    */ - private static Map, Boolean>, ValueConverter> strictParamsByClassAndShallowness = new HashMap<>(); + private static final Map, Boolean>, ValueConverter> strictParamsByClassAndShallowness = new HashMap<>(); static { // TODO Specify strictness in name? registerStrictConverter(String.class, false, new SimpleTypeConverter<>(StringValue.class, StringValue::getString, "string")); @@ -279,7 +251,7 @@ public interface Param strictParamsByClassAndShallowness.put(key, converter); } - private static List, ValueConverter>> customFactories = new ArrayList<>(); + private static final List, ValueConverter>> customFactories = new ArrayList<>(); /** *

    Allows extensions to register COMPLEX {@link ValueConverter} factories in order to be used with the {@link Param.Custom}