Skip to content

Commit fc193d7

Browse files
committed
Note: Im not him, + helper
1 parent 1f172b0 commit fc193d7

2 files changed

Lines changed: 23 additions & 6 deletions

File tree

api/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class EntityMeta implements EntityMetadataProvider {
2525

2626
static final MetaConverterRegistry META_CONVERTER_REGISTRY = new MetaConverterRegistry();
2727

28+
2829
public static @NotNull BiFunction<Integer, Metadata, EntityMeta> getConverter(EntityType entityType) {
2930
return META_CONVERTER_REGISTRY.get(entityType);
3031
}
@@ -144,16 +145,16 @@ public void setFlyingWithElytra(boolean value) {
144145
}
145146

146147
public short getAirTicks() {
147-
// Food for thought later on
148-
// if (isVersionNewer(ServerVersion.V_26_1)) {
149-
// return this.metadata.getIndex((byte)1, (short)300);
150-
// }
148+
// Food for thought later on
149+
if (isVersion(ServerVersion.V_1_21_11, VersionComparison.NEWER_THAN)) {
150+
return (short)this.metadata.getIndex((byte)1, (int)300).shortValue();
151+
}
151152
return this.metadata.getIndex((byte)1, (short) 300);
152153
}
153154

154155
public void setAirTicks(short value) {
155-
if (isVersionNewer(ServerVersion.V_26_1)) {
156-
this.metadata.setIndex((byte)1, EntityDataTypes.INT, value);
156+
if (isVersion(ServerVersion.V_1_21_11, VersionComparison.NEWER_THAN)) {
157+
this.metadata.setIndex((byte)1, EntityDataTypes.INT, (int)value);
157158
}
158159
else {
159160
this.metadata.setIndex((byte)1, EntityDataTypes.SHORT, value);

api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.tofaa.entitylib.wrapper;
22

33
import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
4+
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
45
import com.github.retrooper.packetevents.protocol.player.User;
56
import com.github.retrooper.packetevents.protocol.world.Location;
67
import com.github.retrooper.packetevents.util.Vector3d;
@@ -39,6 +40,21 @@
3940
import org.jetbrains.annotations.UnmodifiableView;
4041

4142
public class WrapperEntity implements Tickable {
43+
44+
public static Class<? extends WrapperEntity> getWrapperClassFromType(EntityType e) {
45+
if (e == EntityTypes.PLAYER) {
46+
return WrapperPlayer.class;
47+
}
48+
if (EntityMeta.isLivingEntity(e)) {
49+
return WrapperLivingEntity.class;
50+
}
51+
if (e == EntityTypes.EXPERIENCE_ORB) {
52+
return WrapperExperienceOrbEntity.class;
53+
}
54+
return WrapperEntity.class;
55+
}
56+
57+
4258
private final UUID uuid;
4359
private final int entityId;
4460
private final EntityType entityType;

0 commit comments

Comments
 (0)