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

25w45a

Browse Source
This commit is contained in:
gnembon committed 2025-11-04 18:04:16 +01:00
1 parent 2ddfdddb89
commit 0a146e1d4e
36 files changed
+115 -115
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+4 -4
View File
@@ -32,7 +32,7 @@ import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
import net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket;
import net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
@@ -385,7 +385,7 @@ public class EntityValue extends Value
return (illagers.contains(type) || arthropods.contains(type) || undeads.contains(type) || aquatique.contains(type)) && e.isAlive();
}, allTypes.stream().filter(et -> !regular.contains(et) && living.contains(et))));
for (ResourceLocation typeId : BuiltInRegistries.ENTITY_TYPE.keySet())
for (Identifier typeId : BuiltInRegistries.ENTITY_TYPE.keySet())
{
EntityType<?> type = BuiltInRegistries.ENTITY_TYPE.getValue(typeId);
String mobType = ValueConversions.simplify(typeId);
@@ -500,7 +500,7 @@ public class EntityValue extends Value
put("immune_to_frost", (e, a) -> BooleanValue.of(!e.canFreeze()));
put("invulnerable", (e, a) -> BooleanValue.of(e instanceof Player player ? player.getAbilities().invulnerable : e.isInvulnerable()));
put("dimension", (e, a) -> nameFromRegistryId(e.level().dimension().location())); // getDimId
put("dimension", (e, a) -> nameFromRegistryId(e.level().dimension().identifier())); // getDimId
put("height", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).height()));
put("width", (e, a) -> new NumericValue(e.getDimensions(Pose.STANDING).width()));
put("eye_height", (e, a) -> new NumericValue(e.getEyeHeight()));
@@ -853,7 +853,7 @@ public class EntityValue extends Value
AttributeMap container = el.getAttributes();
return MapValue.wrap(attributes.listElements().filter(container::hasAttribute).collect(Collectors.toMap(aa -> ValueConversions.of(aa.key()), aa -> NumericValue.of(container.getValue(aa)))));
}
ResourceLocation id = InputValidator.identifierOf(a.getString());
Identifier id = InputValidator.identifierOf(a.getString());
Holder<Attribute> attrib = attributes.get(id).orElseThrow(
() -> new InternalExpressionException("Unknown attribute: " + a.getString())
);