Skip to content

Commit 7298de0

Browse files
committed
Use dyecolor and byte, remove old method
1 parent e181b97 commit 7298de0

File tree

3 files changed

+42
-5
lines changed

3 files changed

+42
-5
lines changed

api/src/main/java/me/tofaa/entitylib/meta/mobs/golem/ShulkerMeta.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package me.tofaa.entitylib.meta.mobs.golem;
22

3+
import com.github.retrooper.packetevents.protocol.color.DyeColor;
34
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
45
import com.github.retrooper.packetevents.protocol.world.Direction;
56
import com.github.retrooper.packetevents.util.Vector3i;
67
import me.tofaa.entitylib.meta.Metadata;
78
import me.tofaa.entitylib.meta.types.MobMeta;
9+
import net.kyori.adventure.text.format.NamedTextColor;
810

911
import java.util.Optional;
1012

@@ -13,6 +15,8 @@ public class ShulkerMeta extends MobMeta {
1315
public static final byte OFFSET = MobMeta.MAX_OFFSET;
1416
public static final byte MAX_OFFSET = OFFSET + 1;
1517

18+
private static final DyeColor[] DYE_COLORS = DyeColor.values();
19+
1620

1721
public ShulkerMeta(int entityId, Metadata metadata) {
1822
super(entityId, metadata);
@@ -35,20 +39,27 @@ public void setAttachmentPosition(Vector3i value) {
3539
}
3640

3741
public byte getShieldHeight() {
38-
return super.metadata.getIndex(offset(OFFSET, 2), (byte) 0);
42+
return super.metadata.getIndex(offset(OFFSET, 1), (byte) 0);
3943
}
4044

4145
public void setShieldHeight(byte value) {
42-
super.metadata.setIndex(offset(OFFSET, 2), EntityDataTypes.BYTE, value);
46+
super.metadata.setIndex(offset(OFFSET, 1), EntityDataTypes.BYTE, value);
4347
}
4448

4549
public byte getColor() {
46-
return super.metadata.getIndex(offset(OFFSET, 3), (byte) 10);
50+
return super.metadata.getIndex(offset(OFFSET, 2), (byte) 16);
51+
}
52+
53+
public DyeColor getColorEnum() {
54+
return DYE_COLORS[getColor()];
4755
}
4856

4957
public void setColor(byte value) {
50-
super.metadata.setIndex(offset(OFFSET, 3), EntityDataTypes.BYTE, value);
58+
super.metadata.setIndex(offset(OFFSET, 2), EntityDataTypes.BYTE, value);
5159
}
5260

61+
public void setColor(DyeColor color) {
62+
setColor((byte)color.ordinal());
63+
}
5364

5465
}

buildSrc/src/main/kotlin/me/tofaa/entitylib/version/ELVersionTask.kt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ abstract class ELVersionTask : DefaultTask() {
4040
* This file is generated by the auto-version task. Modifying it will have no effect.
4141
*/
4242
package $packageName;
43-
43+
44+
import java.text.DateFormat;
4445
import com.github.retrooper.packetevents.util.PEVersion;
4546
4647
public final class ELVersions {
@@ -52,6 +53,29 @@ abstract class ELVersionTask : DefaultTask() {
5253
private ELVersions() {
5354
throw new IllegalStateException();
5455
}
56+
57+
public static class Version {
58+
59+
private final long timestamp;
60+
61+
public Version(long timestamp) {
62+
this.timestamp = timestamp;
63+
}
64+
65+
public long getTimestamp() {
66+
return timestamp;
67+
}
68+
69+
public String getTimestampFormatted() {
70+
return DateFormat.getDateTimeInstance().format(new java.util.Date(timestamp));
71+
}
72+
73+
public boolean isOlderThan(Version version) {
74+
return this.timestamp < version.timestamp;
75+
}
76+
77+
}
78+
5579
}
5680
""".trimIndent())
5781
}

test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
import org.bukkit.plugin.java.JavaPlugin;
1010

1111
import java.lang.reflect.InvocationTargetException;
12+
import java.text.DateFormat;
1213

1314
public class TestEntityLibPlugin extends JavaPlugin {
1415

1516
@Override
1617
public void onEnable() {
18+
DateFormat.getDateTimeInstance().format(new java.util.Date(timestamp));
1719

1820
SpigotEntityLibPlatform platform = new SpigotEntityLibPlatform(this);
1921
APIConfig settings = new APIConfig(PacketEvents.getAPI())

0 commit comments

Comments
 (0)