samples = new HashMap<>(64);
for (int posX = 0; posX < 16; posX += 4) {
for (int posZ = 0; posZ < 16; posZ += 4) {
samples.clear();
for (int posY = 0; posY < 256; posY += 16) {
VirtualBiome biome = biomes[/*SimpleChunk.getBiomeIndex(posX, posY, posZ)*/(posY >> 2 & 63) << 4 | (posZ >> 2 & 3) << 2 | posX >> 2 & 3];
- samples.put(biome.getID(), samples.getOrDefault(biome.getID(), 0) + 1);
+ samples.put(biome.getId(), samples.getOrDefault(biome.getId(), 0) + 1);
}
int id = samples.entrySet()
.stream()
@@ -42,7 +42,7 @@ public BiomeData(ChunkSnapshot chunk) {
.getKey();
for (int i = posX; i < posX + 4; ++i) {
for (int j = posZ; j < posZ + 4; ++j) {
- this.pre115Biomes[(j << 4) + i] = (byte) id;
+ this.pre115Biomes[(j << 4) + i] = id;
}
}
}
@@ -53,7 +53,7 @@ public int[] getPost115Biomes() {
return this.post115Biomes;
}
- public byte[] getPre115Biomes() {
+ public int[] getPre115Biomes() {
return this.pre115Biomes;
}
}
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/BlockPos.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/BlockPos.java
new file mode 100644
index 00000000..dc6db112
--- /dev/null
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/BlockPos.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2021 - 2024 Elytrium
+ *
+ * The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package net.elytrium.limboapi.api.protocol.packets.data;
+
+public record BlockPos(int posX, int posY, int posZ) implements EntityDataValue.Particle.VibrationParticle.PositionSource {
+
+}
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/EntityDataValue.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/EntityDataValue.java
new file mode 100644
index 00000000..c18c7891
--- /dev/null
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/EntityDataValue.java
@@ -0,0 +1,514 @@
+/*
+ * Copyright (C) 2021 - 2024 Elytrium
+ *
+ * The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package net.elytrium.limboapi.api.protocol.packets.data;
+
+import com.velocitypowered.api.network.ProtocolVersion;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.OptionalInt;
+import java.util.UUID;
+import net.elytrium.limboapi.api.player.LimboPlayer;
+import net.kyori.adventure.nbt.BinaryTag;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
+import net.kyori.adventure.nbt.EndBinaryTag;
+import net.kyori.adventure.text.Component;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.common.value.qual.IntRange;
+
+/**
+ * The value can be one of the following data types (note that some are version-specific):
+ *
+ * {@link Byte},
+ * {@link Short} (2-byte short <1.9, VarInt >=1.9),
+ * {@link Integer} (4-byte int <=1.8, VarInt >1.8),
+ * {@link Long} (4-byte int <=1.8, VarInt <=1.19.2, VarLong >1.19.2),
+ * {@link Float}, {@link String}, {@link NBTComponent}, {@link Component}, {@link OptionalNBTComponent}, {@link OptionalComponent}, {@link ItemStack},
+ * {@link Boolean}, (serialized as byte data type <=1.8, boolean >1.8)
+ * {@link Rotations}, {@link BlockPos}, {@link OptionalBlockPos}, {@link Direction}, {@link OptionalUUID}, {@link BlockState}, {@link OptionalBlockState},
+ * {@link CompoundBinaryTag} ({@link EndBinaryTag#endBinaryTag()} Should be used instead as null),
+ * {@link Particle}, {@link Particles}, {@link VillagerData},
+ * {@link OptionalInt} (Also known as OptionalUnsignedInt) (4-byte int <=1.8, VarInt <=1.13.2, OptionalInt >1.13.2),
+ * {@link Pose}, {@link CatVariant}, {@link WolfVariant}, {@link FrogVariant}, {@link OptionalGlobalPos}, {@link PaintingVariant},
+ * {@link SnifferState}, {@link ArmadilloState}, {@link Vector3}, {@link Quaternion}.
+ *
+ *
+ * @see LimboPlayer#setEntityData(int, Collection)
+ */
+public record EntityDataValue(int id, @Nullable T value) {
+
+ //public EntityDataValue {
+ // System.out.println(value);
+ //}
+
+ public record OptionalComponent(@Nullable Component component) {
+
+ public static final OptionalComponent EMPTY = new OptionalComponent(null);
+ }
+
+ /**
+ * Modern {@link Component} represented in compound nbt tag, used in >=1.20.3. Will be automatically converted to a JSON component when encoding for <1.20.3
+ */
+ public record NBTComponent(BinaryTag component) {
+
+ }
+
+ public record OptionalNBTComponent(@Nullable NBTComponent component) {
+
+ public static final OptionalNBTComponent EMPTY = new OptionalNBTComponent(null);
+ }
+
+ public record OptionalBlockPos(@Nullable BlockPos blockPos) {
+
+ public static final OptionalBlockPos EMPTY = new OptionalBlockPos(null);
+ }
+
+ /**
+ * @sinceMinecraft 1.8
+ */
+ public record Rotations(float posX, float posY, float posZ) {
+
+ public Rotations(float posX, float posY, float posZ) {
+ this.posX = !Float.isInfinite(posX) && !Float.isNaN(posX) ? posX % 360.0F : 0.0F;
+ this.posY = !Float.isInfinite(posY) && !Float.isNaN(posY) ? posY % 360.0F : 0.0F;
+ this.posZ = !Float.isInfinite(posZ) && !Float.isNaN(posZ) ? posZ % 360.0F : 0.0F;
+ }
+ }
+
+ public enum Direction {
+
+ DOWN,
+ UP,
+ NORTH,
+ SOUTH,
+ WEST,
+ EAST;
+
+ public static final Direction[] VALUES = Direction.values();
+ }
+
+ public record OptionalUUID(@Nullable UUID uuid) {
+
+ public static final OptionalUUID EMPTY = new OptionalUUID(null);
+ }
+
+ /**
+ * @sinceMinecraft 1.19.4
+ */
+ public record BlockState(int blockState/*TODO use existing api*/) implements Particle.ParticleData {
+
+ }
+
+ public record OptionalBlockState(@Nullable BlockState blockState) {
+
+ public static final OptionalBlockState EMPTY = new OptionalBlockState(null);
+ }
+
+ /**
+ * @sinceMinecraft 1.13
+ */
+ public record Particle(int type/*TODO enum + registry*/, @Nullable ParticleData data) {
+
+ /**
+ * @sinceMinecraft 1.20.5
+ * @param color ARGB
+ */
+ public record ColorParticleData(int color) implements ParticleData {
+
+ /**
+ * @param red must be within range [0.0, 1.0]
+ * @param green must be within range [0.0, 1.0]
+ * @param blue must be within range [0.0, 1.0]
+ */
+ public ColorParticleData(float red, float green, float blue) {
+ this(1.0F, red, green, blue);
+ }
+
+ /**
+ * @param alpha must be within range [0.0, 1.0]
+ * @param red must be within range [0.0, 1.0]
+ * @param green must be within range [0.0, 1.0]
+ * @param blue must be within range [0.0, 1.0]
+ */
+ public ColorParticleData(float alpha, float red, float green, float blue) {
+ this(ColorParticleData.as8BitChannel(alpha), ColorParticleData.as8BitChannel(red), ColorParticleData.as8BitChannel(green), ColorParticleData.as8BitChannel(blue));
+ }
+
+ /**
+ * @param red must be within range [0, 255]
+ * @param green must be within range [0, 255]
+ * @param blue must be within range [0, 255]
+ */
+ public ColorParticleData(@IntRange(from = 0, to = 255) int red, @IntRange(from = 0, to = 255) int green, @IntRange(from = 0, to = 255) int blue) {
+ this(255, red, green, blue);
+ }
+
+ /**
+ * @param alpha must be within range [0, 255]
+ * @param red must be within range [0, 255]
+ * @param green must be within range [0, 255]
+ * @param blue must be within range [0, 255]
+ */
+ public ColorParticleData(@IntRange(from = 0, to = 255) int alpha, @IntRange(from = 0, to = 255) int red, @IntRange(from = 0, to = 255) int green, @IntRange(from = 0, to = 255) int blue) {
+ this((alpha << 24) | (red << 16) | (green << 8) | blue);
+ }
+
+ public float red() {
+ return (float) (this.color >> 16 & 0xFF) / 255.0F;
+ }
+
+ public float green() {
+ return (float) (this.color >> 8 & 0xFF) / 255.0F;
+ }
+
+ public float blue() {
+ return (float) (this.color & 0xFF) / 255.0F;
+ }
+
+ public float alpha() {
+ return (float) (this.color >>> 24) / 255.0F;
+ }
+
+ private static int as8BitChannel(float f) {
+ return ColorParticleData.floor(f * 255.0F);
+ }
+
+ private static int floor(float f) {
+ int i = (int) f;
+ return f < i ? i - 1 : i;
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.17
+ * @param scale Must be within range [0.01, 4.0]
+ */
+ public record DustColorTransitionParticleData(float fromRed, float fromGreen, float fromBlue, float toRed, float toGreen, float toBlue, float scale) implements ParticleData {
+
+ public DustColorTransitionParticleData(float fromRed, float fromGreen, float fromBlue, float toRed, float toGreen, float toBlue, float scale) {
+ this.fromRed = fromRed;
+ this.fromGreen = fromGreen;
+ this.fromBlue = fromBlue;
+ this.toRed = toRed;
+ this.toGreen = toGreen;
+ this.toBlue = toBlue;
+ this.scale = scale < 0.01F ? 0.01F : Math.min(scale, 4.0F);
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.13
+ * @param scale Must be within range [0.01, 4.0]
+ */
+ public record DustParticleData(float red, float green, float blue, float scale) implements ParticleData {
+
+ /**
+ * @param scale Must be within range [0.01, 4.0]
+ */
+ public DustParticleData(float red, float green, float blue, float scale) {
+ this.red = red;
+ this.green = green;
+ this.blue = blue;
+ this.scale = scale < 0.01F ? 0.01F : Math.min(scale, 4.0F);
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record SculkChargeParticleData(float roll) implements ParticleData {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record ShriekParticle(int delay) implements ParticleData {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.17
+ * @param origin Used only in [1.17-1.18.2]
+ */
+ public record VibrationParticle(@Deprecated @Nullable BlockPos origin, PositionSource destination, int arrivalInTicks) implements ParticleData {
+
+ public record EntityPositionSource(int entityId, float yOffset) implements PositionSource {
+
+ }
+
+ public sealed interface PositionSource permits BlockPos, EntityPositionSource {
+
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.21.2
+ */
+ public record TargetColorParticle(Vector3 target, int color) implements ParticleData {
+
+ }
+
+ public sealed interface ParticleData permits BlockState,
+ ColorParticleData, DustColorTransitionParticleData, DustParticleData,
+ ItemStack, SculkChargeParticleData, VibrationParticle, TargetColorParticle, ShriekParticle {
+
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.20.5
+ */
+ public static class Particles extends ArrayList {
+
+ public Particles() {
+
+ }
+
+ public Particles(int initialCapacity) {
+ super(initialCapacity);
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.14
+ * @param level Must be no less than 1
+ */
+ public record VillagerData(int type, int profession, int level) {
+
+ public VillagerData(int type, int profession, int level) {
+ this.type = type;
+ this.profession = profession;
+ this.level = Math.max(1, level);
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.14
+ */
+ public enum Pose { // TODO registry map
+
+ STANDING,
+ FALL_FLYING,
+ SLEEPING,
+ SWIMMING,
+ SPIN_ATTACK,
+ CROUCHING,
+ /**
+ * @sinceMinecraft 1.17
+ */
+ LONG_JUMPING,
+ DYING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ CROAKING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ USING_TONGUE,
+ /**
+ * @sinceMinecraft 1.19.3
+ */
+ SITTING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ ROARING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ SNIFFING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ EMERGING,
+ /**
+ * @sinceMinecraft 1.19
+ */
+ DIGGING,
+ /**
+ * @sinceMinecraft 1.20
+ */
+ SLIDING,
+ /**
+ * @sinceMinecraft 1.20
+ */
+ SHOOTING,
+ /**
+ * @sinceMinecraft 1.20
+ */
+ INHALING;
+
+ public static final Pose[] VALUES = Pose.values();
+
+ public int getProtocolId(ProtocolVersion version) {
+ if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20)) { // after 1.19.3 all new poses were added to end
+ return this.ordinal();
+ } else {
+ return switch (this) {
+ case STANDING -> 0;
+ case FALL_FLYING -> 1;
+ case SLEEPING -> 2;
+ case SWIMMING -> 3;
+ case SPIN_ATTACK -> 4;
+ case CROUCHING -> 5;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_17) ? switch (this) {
+ // >=1.17
+ case LONG_JUMPING -> 6;
+ case DYING -> 7;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_19) ? switch (this) {
+ // >=1.19
+ case CROAKING -> 8;
+ case USING_TONGUE -> 9;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_19_3) ? switch (this) {
+ // >=1.19.3
+ case SITTING -> 10;
+ case ROARING -> 11;
+ case SNIFFING -> 12;
+ case EMERGING -> 13;
+ case DIGGING -> 14;
+ default -> Pose.fail(this);
+ } : switch (this) {
+ // >=1.19
+ case ROARING -> 10;
+ case SNIFFING -> 11;
+ case EMERGING -> 12;
+ case DIGGING -> 13;
+ default -> Pose.fail(this);
+ };
+ } : Pose.fail(this);
+ } : this == Pose.DYING ? 6 : Pose.fail(this);
+ };
+ }
+ }
+
+ public static Pose fromProtocolId(int id, ProtocolVersion version) {
+ if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
+ return Pose.VALUES[id];
+ } else {
+ return switch (id) {
+ case 0 -> Pose.STANDING;
+ case 1 -> Pose.FALL_FLYING;
+ case 2 -> Pose.SLEEPING;
+ case 3 -> Pose.SWIMMING;
+ case 4 -> Pose.SPIN_ATTACK;
+ case 5 -> Pose.CROUCHING;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_17) ? switch (id) {
+ // >=1.17
+ case 6 -> Pose.LONG_JUMPING;
+ case 7 -> Pose.DYING;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_19) ? switch (id) {
+ // >=1.19
+ case 8 -> Pose.CROAKING;
+ case 9 -> Pose.USING_TONGUE;
+ default -> version.noLessThan(ProtocolVersion.MINECRAFT_1_19_3) ? switch (id) {
+ // >=1.19.3
+ case 10 -> Pose.SITTING;
+ case 11 -> Pose.ROARING;
+ case 12 -> Pose.SNIFFING;
+ case 13 -> Pose.EMERGING;
+ case 14 -> Pose.DIGGING;
+ default -> Pose.fail(id);
+ } : switch (id) {
+ // >=1.19
+ case 10 -> Pose.ROARING;
+ case 11 -> Pose.SNIFFING;
+ case 12 -> Pose.EMERGING;
+ case 13 -> Pose.DIGGING;
+ default -> Pose.fail(id);
+ };
+ } : Pose.fail(id);
+ } : id == 6 ? Pose.DYING : Pose.fail(id);
+ };
+ }
+ }
+
+ private static T fail(Object value) {
+ throw new IllegalStateException("Unexpected value: " + value);
+ }
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record CatVariant(int id) {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.20.5
+ */
+ public record WolfVariant(int id) {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record FrogVariant(int id) {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record OptionalGlobalPos(@Nullable GlobalPos globalPos) {
+
+ public static final OptionalGlobalPos EMPTY = new OptionalGlobalPos(null);
+ }
+
+ /**
+ * @sinceMinecraft 1.19
+ */
+ public record PaintingVariant(int id) {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.19.4
+ */
+ public enum SnifferState {
+
+ IDLING,
+ FEELING_HAPPY,
+ SCENTING,
+ SNIFFING,
+ SEARCHING,
+ DIGGING,
+ RISING;
+
+ public static final SnifferState[] VALUES = SnifferState.values();
+ }
+
+ /**
+ * @sinceMinecraft 1.20.5
+ */
+ public enum ArmadilloState { // 🤠
+
+ IDLE,
+ ROLLING,
+ SCARED,
+ UNROLLING;
+
+ public static final ArmadilloState[] VALUES = ArmadilloState.values();
+ }
+
+ /**
+ * @sinceMinecraft 1.19.4
+ */
+ public record Vector3(float x, float y, float z) {
+
+ }
+
+ /**
+ * @sinceMinecraft 1.19.4
+ */
+ public record Quaternion(float x, float y, float z, float w) {
+
+ }
+}
diff --git a/api/src/main/templates/net/elytrium/limboapi/BuildConstants.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/GlobalPos.java
similarity index 57%
rename from api/src/main/templates/net/elytrium/limboapi/BuildConstants.java
rename to api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/GlobalPos.java
index f95103dc..550932beb 100644
--- a/api/src/main/templates/net/elytrium/limboapi/BuildConstants.java
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/GlobalPos.java
@@ -5,10 +5,11 @@
* reference the LICENSE file in the api top-level directory.
*/
-package net.elytrium.limboapi;
+package net.elytrium.limboapi.api.protocol.packets.data;
-// The constants are replaced before compilation.
-public class BuildConstants {
+/**
+ * @sinceMinecraft 1.19
+ */
+public record GlobalPos(String dimension, BlockPos blockPos) {
- public static final String LIMBO_VERSION = "${version}";
}
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/ItemStack.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/ItemStack.java
new file mode 100644
index 00000000..c74dfe7c
--- /dev/null
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/ItemStack.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 - 2024 Elytrium
+ *
+ * The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package net.elytrium.limboapi.api.protocol.packets.data;
+
+import net.elytrium.limboapi.api.protocol.item.DataComponentType;
+import net.elytrium.limboapi.api.protocol.item.ItemComponentMap;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public record ItemStack(int material/*TODO VirtualItem*/, int amount, int data, @Nullable CompoundBinaryTag nbt, @Nullable ItemComponentMap map) implements EntityDataValue.Particle.ParticleData {
+
+ public static final ItemStack EMPTY = new ItemStack(-1, 0, 0, null, null);
+
+ public ItemStack(int material, int amount, @Nullable CompoundBinaryTag nbt) {
+ this(material, amount, nbt == null ? 0 : nbt.getInt("Damage", 0), nbt, null);
+ }
+
+ public ItemStack(int material, int amount, @Nullable ItemComponentMap map) {
+ this(material, amount, map == null ? 0 : map.getOrDefault(DataComponentType.DAMAGE, 0), map);
+ }
+
+ public ItemStack(int material, int amount, int data) {
+ this(material, amount, data, null, null);
+ }
+
+ public ItemStack(int material, int amount, int data, @Nullable CompoundBinaryTag nbt) {
+ this(material, amount, data, nbt, null);
+ }
+
+ public ItemStack(int material, int amount, int data, @Nullable ItemComponentMap map) {
+ this(material, amount, data, null, map);
+ }
+
+ public boolean isEmpty(boolean checkDamage) {
+ return this == ItemStack.EMPTY || this.material <= 0 || this.amount <= 0 || (checkDamage && (this.data < -32768 || this.data > 65535));
+ }
+}
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapData.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapData.java
index fbea44ed..99788ab2 100644
--- a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapData.java
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapData.java
@@ -8,62 +8,43 @@
package net.elytrium.limboapi.api.protocol.packets.data;
/**
- * For MapData packet.
+ * For MapData packet
*/
-public class MapData {
+public record MapData(int columns, int rows, int posX, int posY, byte[] data) {
public static final int MAP_DIM_SIZE = 128;
public static final int MAP_SIZE = MAP_DIM_SIZE * MAP_DIM_SIZE; // 128² == 16384
- private final int columns;
- private final int rows;
- private final int posX;
- private final int posY;
- private final byte[] data;
-
public MapData(byte[] data) {
this(0, data);
}
public MapData(int posX, byte[] data) {
- this(MAP_DIM_SIZE, MAP_DIM_SIZE, posX, 0, data);
- }
-
- public MapData(int columns, int rows, int posX, int posY, byte[] data) {
- this.columns = columns;
- this.rows = rows;
- this.posX = posX;
- this.posY = posY;
- this.data = data;
+ this(MapData.MAP_DIM_SIZE, MapData.MAP_DIM_SIZE, posX, 0, data);
}
+ @Deprecated(forRemoval = true)
public int getColumns() {
return this.columns;
}
+ @Deprecated(forRemoval = true)
public int getRows() {
return this.rows;
}
+ @Deprecated(forRemoval = true)
public int getX() {
return this.posX;
}
+ @Deprecated(forRemoval = true)
public int getY() {
return this.posY;
}
+ @Deprecated(forRemoval = true)
public byte[] getData() {
return this.data;
}
-
- @Override
- public String toString() {
- return "MapData{"
- + "columns=" + this.columns
- + ", rows=" + this.rows
- + ", posX=" + this.posX
- + ", posY=" + this.posY
- + "}";
- }
}
diff --git a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java
index ef19822e..2990baf3 100644
--- a/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java
+++ b/api/src/main/java/net/elytrium/limboapi/api/protocol/packets/data/MapPalette.java
@@ -23,10 +23,10 @@
public class MapPalette {
private static final Map REMAP_BUFFERS = new EnumMap<>(MapVersion.class);
- private static final byte[] MAIN_BUFFER = readBuffer("/mapping/colors_main_map");
+ private static final byte[] MAIN_BUFFER = readBuffer("/mappings/colors_main_map");
/**
- * @deprecated Use {@link java.awt.Color#WHITE} instead.
+ * @deprecated Use {@link java.awt.Color#WHITE} instead
*/
@Deprecated
public static final byte WHITE = 34;
@@ -34,7 +34,7 @@ public class MapPalette {
static {
for (MapVersion version : MapVersion.values()) {
- REMAP_BUFFERS.put(version, readBuffer("/mapping/colors_" + version.toString().toLowerCase(Locale.ROOT) + "_map"));
+ REMAP_BUFFERS.put(version, readBuffer("/mappings/colors_" + version.toString().toLowerCase(Locale.ROOT) + "_map"));
}
}
@@ -47,24 +47,24 @@ private static byte[] readBuffer(String filename) {
}
/**
- * Convert an Image to a byte[] using the palette.
- * Uses reduced set of colors, to support more colors use {@link MapPalette#imageToBytes(BufferedImage, ProtocolVersion)}
+ * Convert an Image to a byte[] using the palette
+ * Uses a reduced set of colors, to support more colors use {@link MapPalette#imageToBytes(BufferedImage, ProtocolVersion)}
*
- * @param image The image to convert.
+ * @param image The image to convert
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] imageToBytes(BufferedImage image) {
return imageToBytes(image, ProtocolVersion.MINIMUM_VERSION);
}
/**
- * Convert an Image to a byte[] using the palette.
+ * Convert an Image to a byte[] using the palette
*
- * @param image The image to convert.
- * @param version The ProtocolVersion to support more colors.
+ * @param image The image to convert
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] imageToBytes(BufferedImage image, ProtocolVersion version) {
int[] result = image.getRGB(0, 0, image.getWidth(), image.getHeight(), null, 0, image.getWidth());
@@ -72,25 +72,25 @@ public static int[] imageToBytes(BufferedImage image, ProtocolVersion version) {
}
/**
- * Convert an image to a byte[] using the palette.
+ * Convert an image to a byte[] using the palette
*
- * @param image The image to convert.
- * @param version The ProtocolVersion to support more colors.
+ * @param image The image to convert
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] imageToBytes(int[] image, ProtocolVersion version) {
return imageToBytes(image, new int[image.length], version);
}
/**
- * Convert an image to a byte[] using the palette.
+ * Convert an image to a byte[] using the palette
*
- * @param from The image to convert.
- * @param to Output image.
- * @param version The ProtocolVersion to support more colors.
+ * @param from The image to convert
+ * @param to Output image
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] imageToBytes(int[] from, int[] to, ProtocolVersion version) {
for (int i = 0; i < from.length; ++i) {
@@ -101,13 +101,13 @@ public static int[] imageToBytes(int[] from, int[] to, ProtocolVersion version)
}
/**
- * Convert an image to a byte[] using the palette.
+ * Convert an image to a byte[] using the palette
*
- * @param from The image to convert.
- * @param to Output image.
- * @param version The ProtocolVersion to support more colors.
+ * @param from The image to convert
+ * @param to Output image
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static byte[] imageToBytes(int[] from, byte[] to, ProtocolVersion version) {
for (int i = 0; i < from.length; ++i) {
@@ -118,23 +118,23 @@ public static byte[] imageToBytes(int[] from, byte[] to, ProtocolVersion version
}
/**
- * Get the index of the closest matching color in the palette to the given
- * color. Uses caching and downscaling of color values.
+ * Get the index of the closest matching color in the palette to the given color
+ * Uses caching and downscaling of color values
*
- * @param rgb The Color to match.
+ * @param rgb The Color to match
*
- * @return The index in the palette.
+ * @return The index in the palette
*/
public static byte tryFastMatchColor(int rgb, ProtocolVersion version) {
if (getAlpha(rgb) < 128) {
return TRANSPARENT;
} else {
MapVersion mapVersion = MapVersion.fromProtocolVersion(version);
- byte originalColorID = MAIN_BUFFER[rgb & 0xFFFFFF];
+ byte originalColorId = MAIN_BUFFER[rgb & 0xFFFFFF];
if (mapVersion == MapVersion.MAXIMUM_VERSION) {
- return originalColorID;
+ return originalColorId;
} else {
- return remapByte(REMAP_BUFFERS.get(mapVersion), originalColorID);
+ return remapByte(REMAP_BUFFERS.get(mapVersion), originalColorId);
}
}
}
@@ -146,10 +146,10 @@ private static int getAlpha(int rgb) {
/**
* Convert an image from MapVersion.MAXIMUM_VERSION to the desired version
*
- * @param image The image to convert.
- * @param version The ProtocolVersion to support more colors.
+ * @param image The image to convert
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] convertImage(int[] image, MapVersion version) {
return convertImage(image, new int[image.length], version);
@@ -158,11 +158,11 @@ public static int[] convertImage(int[] image, MapVersion version) {
/**
* Convert an image from MapVersion.MAXIMUM_VERSION to the desired version
*
- * @param from The image to convert.
- * @param to Output image.
- * @param version The ProtocolVersion to support more colors.
+ * @param from The image to convert
+ * @param to Output image
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static int[] convertImage(int[] from, int[] to, MapVersion version) {
byte[] remapBuffer = REMAP_BUFFERS.get(version);
@@ -176,11 +176,11 @@ public static int[] convertImage(int[] from, int[] to, MapVersion version) {
/**
* Convert an image from MapVersion.MAXIMUM_VERSION to the desired version
*
- * @param from The image to convert.
- * @param to Output image.
- * @param version The ProtocolVersion to support more colors.
+ * @param from The image to convert
+ * @param to Output image
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static byte[] convertImage(byte[] from, byte[] to, MapVersion version) {
byte[] remapBuffer = REMAP_BUFFERS.get(version);
@@ -194,11 +194,11 @@ public static byte[] convertImage(byte[] from, byte[] to, MapVersion version) {
/**
* Convert an image from MapVersion.MAXIMUM_VERSION to the desired version
*
- * @param from The image to convert.
- * @param to Output image.
- * @param version The ProtocolVersion to support more colors.
+ * @param from The image to convert
+ * @param to Output image
+ * @param version The ProtocolVersion to support more colors
*
- * @return A byte[] containing the pixels of the image.
+ * @return A byte[] containing the pixels of the image
*/
public static byte[] convertImage(int[] from, byte[] to, MapVersion version) {
byte[] remapBuffer = REMAP_BUFFERS.get(version);
@@ -210,7 +210,7 @@ public static byte[] convertImage(int[] from, byte[] to, MapVersion version) {
}
private static byte remapByte(byte[] remapBuffer, byte oldByte) {
- return remapBuffer[Byte.toUnsignedInt(oldByte)];
+ return remapBuffer[oldByte & 0xFF];
}
public enum MapVersion {
diff --git a/build.gradle b/build.gradle
index 0ffa818b..d85ae7ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,71 +1,99 @@
-//file:noinspection GroovyAssignabilityCheck
-
plugins() {
id("java")
- id("checkstyle")
- id("com.github.spotbugs").version("6.0.12").apply(false)
- id("org.cadixdev.licenser").version("0.6.1").apply(false)
+ id("org.ajoberstar.grgit").version("5.2.2")
+
+ id("com.diffplug.spotless").version("6.25.0").apply(false)
+ id("com.github.spotbugs").version("6.0.19").apply(false)
+
+ id("io.github.goooler.shadow").version("8.1.8")
+}
+
+this.group = "net.elytrium"
+this.version = "1.2.0-SNAPSHOT"
+
+if (this.version.endsWith("-SNAPSHOT")) {
+ this.version += "+${grgit.head().abbreviatedId}"
}
-allprojects() {
+subprojects() {
+ apply(plugin: "java-library")
+
+ //apply(plugin: "com.diffplug.spotless")
apply(plugin: "checkstyle")
apply(plugin: "com.github.spotbugs")
- apply(plugin: "org.cadixdev.licenser")
- setGroup("net.elytrium.limboapi")
- setVersion("1.1.27")
+ tasks.withType(JavaCompile).configureEach() {
+ options.setEncoding("UTF-8")
+ }
+
+ java() {
+ sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+ }
- compileJava() {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ configurations() {
+ api.extendsFrom(shadowApi)
}
repositories() {
mavenCentral()
maven() {
- setName("elytrium-repo")
- setUrl("https://maven.elytrium.net/repo/")
+ name = "elytrium"
+ url = "https://maven.elytrium.net/repo/"
}
+
maven() {
- setName("papermc-repo")
- setUrl("https://papermc.io/repo/repository/maven-public/")
+ name = "papermc"
+ url = "https://repo.papermc.io/repository/maven-public/"
}
}
+ //spotless() {
+ // java() {
+ // licenseHeaderFile(rootProject.file("HEADER.txt"))
+ // }
+ //}
+
checkstyle() {
- toolVersion = "10.12.1"
- configFile = file("$rootDir/config/checkstyle/checkstyle.xml")
- configProperties = ["configDirectory": "$rootDir/config/checkstyle"]
+ toolVersion = "10.17.0"
+
+ configFile = rootProject.file(".config/checkstyle/checkstyle.xml")
maxErrors = 0
maxWarnings = 0
}
- spotbugs() {
- excludeFilter = file("${this.getRootDir()}/config/spotbugs/suppressions.xml")
-
- if (this.project != rootProject) {
- reports.register("html") {
+ spotbugsMain() {
+ excludeFilter.set(rootProject.file(".config/spotbugs/suppressions.xml"))
+ reports() {
+ html() {
required = true
- outputLocation.value(layout.buildDirectory.file("reports/spotbugs/main/spotbugs.html"))
+ outputLocation.value(layout.buildDirectory.file("reports/spotbugs/spotbugs.html"))
stylesheet = "fancy-hist.xsl"
}
}
}
}
-String getCurrentShortRevision() {
- OutputStream outputStream = new ByteArrayOutputStream()
- exec {
- if (System.getProperty("os.name").toLowerCase().contains("win")) {
- commandLine("cmd", "/c", "git rev-parse --short HEAD")
- } else {
- commandLine("bash", "-c", "git rev-parse --short HEAD")
- }
+gradle.projectsEvaluated() {
+ shadowJar() {
+ archiveClassifier = null
+
+ //enableRelocation = true
+ //relocationPrefix = "${this.group}.${this.rootProject.getName()}.3rdparty"
+ // TODO remove
+ relocate("org.bstats", "net.elytrium.limboapi.thirdparty.org.bstats")
+ relocate("net.elytrium.fastprepare", "net.elytrium.limboapi.thirdparty.fastprepare")
+ relocate("net.elytrium.commons.velocity", "net.elytrium.limboapi.thirdparty.commons.velocity")
+ relocate("net.elytrium.commons.kyori", "net.elytrium.limboapi.thirdparty.commons.kyori")
+ relocate("net.elytrium.commons.config", "net.elytrium.limboapi.thirdparty.commons.config")
- setStandardOutput(outputStream)
+ configurations = []
+ this.subprojects.forEach(project -> {
+ configurations.add(project.configurations.shadowApi)
+ from(project.sourceSets.main.output)
+ })
}
- return outputStream.toString().trim()
+ assemble.dependsOn(shadowJar)
}
diff --git a/gradle.properties b/gradle.properties
index 0fd62712..ea880281 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
-org.gradle.jvmargs=-Xmx4096m
-fastPrepareVersion=1.0.13
-velocityVersion=3.4.0-SNAPSHOT
-nettyVersion=4.1.86.Final
-fastutilVersion=8.5.11
-bstatsVersion=3.0.0
-spotbugsVersion=4.7.3
-elytriumCommonsVersion=1.2.3
-adventureVersion=4.15.0
+org.gradle.caching=true
+org.gradle.parallel=true
+
+org.gradle.jvmargs=-Xmx4G
+
manifestUrl=https://launchermeta.mojang.com/mc/game/version_manifest.json
-cacheValidMillis=6000000
\ No newline at end of file
+# 1 week
+cacheValidMillis=604800000
+
+# Well, yeah...
+gameVersions=1.21,1.20.6,1.20.5,1.20.4,1.20.3,1.20.2,1.20.1,1.20,1.19.4,1.19.3,1.19.2,1.19.1,1.19,1.18.2,1.18.1,1.18,1.17.1,1.17,1.16.5,1.16.4,1.16.3,1.16.2,1.16.1,1.16,1.15.2,1.15.1,1.15,1.14.4,1.14.3,1.14.2,1.14.1,1.14,1.13.2,1.13.1,1.13,1.12.2,1.12.1,1.12,1.11.2,1.11.1,1.11,1.10.2,1.10.1,1.10,1.9.4,1.9.3,1.9.2,1.9.1,1.9,1.8.9,1.8.8,1.8.7,1.8.6,1.8.5,1.8.4,1.8.3,1.8.2,1.8.1,1.8,1.7.10,1.7.9,1.7.8,1.7.7,1.7.6,1.7.5,1.7.4,1.7.3,1.7.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..c740b1b3
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,19 @@
+[versions]
+velocity = "3.4.0-SNAPSHOT"
+
+# TODO
+[libraries]
+velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
+velocity-proxy = { module = "com.velocitypowered:velocity-proxy", version.ref = "velocity" } # from Elytrium repo
+
+[bundles]
+velocity = ["velocity-proxy"]
+
+[plugins]
+grgit = "org.ajoberstar.grgit:5.2.2"
+buildconfig = "com.github.gmazzo.buildconfig:5.3.5" # kotlin 💀
+
+spotless = "com.diffplug.spotless:6.25.0"
+spotbugs = "com.github.spotbugs:6.0.13"
+
+modrinth = "com:1"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..2c352119 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48c0a02c..7cf748e7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +217,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32..9d21a218 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/lobb.nbt b/lobb.nbt
new file mode 100644
index 00000000..35bb061a
Binary files /dev/null and b/lobb.nbt differ
diff --git a/mappings-1.13to1.12.nbt b/mappings-1.13to1.12.nbt
new file mode 100644
index 00000000..e246587a
Binary files /dev/null and b/mappings-1.13to1.12.nbt differ
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 5bf07b13..05e0bb29 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,699 +1,39 @@
-//file:noinspection GroovyAssignabilityCheck
-
-buildscript() {
- dependencies() {
- classpath("commons-io:commons-io:2.6")
- classpath("com.google.guava:guava:28.0-jre")
- }
-}
+//file:noinspection VulnerableLibrariesLocal
plugins() {
- id("java")
- id("io.github.goooler.shadow").version("8.1.8")
+ id("com.modrinth.minotaur").version("2.8.7")
}
-compileJava() {
- getOptions().getRelease().set(17)
- getOptions().setEncoding("UTF-8")
-}
+apply(from: "mappings_generator.gradle")
dependencies() {
- implementation(project(":api"))
- implementation("net.elytrium.commons:config:$elytriumCommonsVersion")
- implementation("net.elytrium.commons:utils:$elytriumCommonsVersion")
- implementation("net.elytrium.commons:velocity:$elytriumCommonsVersion")
- implementation("net.elytrium.commons:kyori:$elytriumCommonsVersion")
-
- implementation("net.elytrium:fastprepare:$fastPrepareVersion")
- compileOnly("com.velocitypowered:velocity-api:$velocityVersion")
- annotationProcessor("com.velocitypowered:velocity-api:$velocityVersion")
- compileOnly("com.velocitypowered:velocity-proxy:$velocityVersion") // From Elytrium Repo.
- compileOnly("com.velocitypowered:velocity-native:$velocityVersion")
-
- // Needs for some velocity methods.
- compileOnly("io.netty:netty-codec:$nettyVersion")
- compileOnly("io.netty:netty-handler:$nettyVersion")
- compileOnly("it.unimi.dsi:fastutil-core:$fastutilVersion")
-
- implementation("org.bstats:bstats-velocity:$bstatsVersion")
-
- compileOnly("com.github.spotbugs:spotbugs-annotations:$spotbugsVersion")
-}
-
-shadowJar() {
- getArchiveClassifier().set("")
- setArchiveFileName("limboapi-${project.version}.jar")
-
- exclude("META-INF/versions/**")
- exclude("net/kyori/**")
-
- relocate("org.bstats", "net.elytrium.limboapi.thirdparty.org.bstats")
- relocate("net.elytrium.fastprepare", "net.elytrium.limboapi.thirdparty.fastprepare")
- relocate("net.elytrium.commons.velocity", "net.elytrium.limboapi.thirdparty.commons.velocity")
- relocate("net.elytrium.commons.kyori", "net.elytrium.limboapi.thirdparty.commons.kyori")
- relocate("net.elytrium.commons.config", "net.elytrium.limboapi.thirdparty.commons.config")
-}
-
-license() {
- matching(includes: ["**/mcprotocollib/**"]) {
- setHeader(getRootProject().file("HEADER_MCPROTOCOLLIB.txt"))
- }
- matching(includes: ["**/LoginListener.java", "**/KickListener.java", "**/LoginTasksQueue.java", "**/MinecraftLimitedCompressDecoder.java"]) {
- setHeader(getRootProject().file("HEADER_MIXED.txt"))
- }
-
- setHeader(getRootProject().file("HEADER.txt"))
-}
-
-tasks.register("finalize") {
- doLast {
- file("build/libs/${project.name}-${project.version}.jar").delete()
- }
-}
-
-assemble.dependsOn(shadowJar)
-build.finalizedBy(finalize)
-
-import groovy.io.FileType
-import groovy.json.JsonOutput
-import groovy.json.JsonSlurper
-import org.apache.commons.io.FilenameUtils
-import org.apache.commons.io.FileUtils
-import com.google.common.hash.Hashing
-import com.google.common.io.Files
-
-import java.nio.file.Path
-import java.util.function.Function
-import java.util.stream.Collectors
-
-enum MinecraftVersion {
- MINECRAFT_1_7_2(4),
- MINECRAFT_1_7_6(5),
- MINECRAFT_1_8(47),
- MINECRAFT_1_9(107),
- MINECRAFT_1_9_1(108),
- MINECRAFT_1_9_2(109),
- MINECRAFT_1_9_4(110),
- MINECRAFT_1_10(210),
- MINECRAFT_1_11(315),
- MINECRAFT_1_11_1(316),
- MINECRAFT_1_12(335),
- MINECRAFT_1_12_1(338),
- MINECRAFT_1_12_2(340),
- MINECRAFT_1_13(393),
- MINECRAFT_1_13_1(401),
- MINECRAFT_1_13_2(404),
- MINECRAFT_1_14(477),
- MINECRAFT_1_14_1(480),
- MINECRAFT_1_14_2(485),
- MINECRAFT_1_14_3(490),
- MINECRAFT_1_14_4(498),
- MINECRAFT_1_15(573),
- MINECRAFT_1_15_1(575),
- MINECRAFT_1_15_2(578),
- MINECRAFT_1_16(735),
- MINECRAFT_1_16_1(736),
- MINECRAFT_1_16_2(751),
- MINECRAFT_1_16_3(753),
- MINECRAFT_1_16_4(754),
- MINECRAFT_1_17(755),
- MINECRAFT_1_17_1(756),
- MINECRAFT_1_18(757),
- MINECRAFT_1_18_2(758),
- MINECRAFT_1_19(759),
- MINECRAFT_1_19_1(760),
- MINECRAFT_1_19_3(761),
- MINECRAFT_1_19_4(762),
- MINECRAFT_1_20(763),
- MINECRAFT_1_20_2(764),
- MINECRAFT_1_20_3(765),
- MINECRAFT_1_20_5(766),
- MINECRAFT_1_21(767),
- MINECRAFT_1_21_2(768)
-
- public static final List WORLD_VERSIONS = List.of(
- MINECRAFT_1_13,
- MINECRAFT_1_13_2,
- MINECRAFT_1_14,
- MINECRAFT_1_15,
- MINECRAFT_1_16,
- MINECRAFT_1_16_2,
- MINECRAFT_1_17,
- MINECRAFT_1_19,
- MINECRAFT_1_19_3,
- MINECRAFT_1_19_4,
- MINECRAFT_1_20,
- MINECRAFT_1_20_3,
- MINECRAFT_1_20_5,
- MINECRAFT_1_21_2
- )
-
- public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2
- public static final MinecraftVersion MAXIMUM_VERSION = values()[values().length - 1]
-
- static MinecraftVersion fromVersionName(String name) {
- return valueOf("MINECRAFT_" + name.replace('.', '_'))
- }
-
- // Cache version name to reduce memory usage in general
- final String versionName = this.toString().substring(10).replace('_', '.')
- final int protocolVersion
-
- MinecraftVersion(int protocolVersion) {
- this.protocolVersion = protocolVersion
- }
-
- int getProtocolVersion() {
- return this.protocolVersion
- }
-
- String getVersionName() {
- return this.versionName
- }
-}
-
-project.ext.dataDirectory = new File(this.getLayout().getBuildDirectory().get().getAsFile(), "minecraft")
-project.ext.generatedDir = new File(this.getLayout().getBuildDirectory().get().getAsFile(), "generated/minecraft")
-project.ext.versionManifestFile = new File(dataDirectory, "manifest.json")
-
-sourceSets {
- main {
- resources {
- srcDirs += generatedDir
- }
- }
-}
-
-tasks.register("downloadManifest") {
- this.println("> Downloading version manifest...")
- versionManifestFile.getParentFile().mkdirs()
- if (checkIsCacheValid(versionManifestFile)) {
- FileUtils.copyURLToFile(new URL(manifestUrl), versionManifestFile)
- }
-}
-
-boolean checkIsCacheValid(File file) {
- if (file.exists() && System.currentTimeMillis() - file.lastModified() < Long.parseLong(cacheValidMillis)) {
- println("> Found cached " + file.getName())
- return false
- }
-
- return true
-}
-File downloadVersionManifest(String version) {
- this.println("> Downloading ${version} manifest...")
-
- Object manifest = new JsonSlurper().parse(versionManifestFile)
- def optional = manifest.versions.stream().filter({ it.id == version }).findFirst()
- if (optional.empty()) {
- throw new RuntimeException("Couldn't find version: ${version}")
- }
-
- File output = new File(dataDirectory, "${version}/manifest.json")
- output.getParentFile().mkdirs()
- FileUtils.copyURLToFile(new URL(optional.get().url), output)
- return output
-}
-
-@SuppressWarnings('GrMethodMayBeStatic')
-File getGeneratedCache(MinecraftVersion version) {
- File generated = new File(dataDirectory, "${version.getVersionName()}/generated")
- return new File(generated, "reports/blocks.json").exists()
- && new File(generated, "reports/${version >= MinecraftVersion.MINECRAFT_1_14 ? "registries" : "items"}.json").exists()
- && new File(generated, "data/minecraft/tags").exists()
- ? generated : null
-}
-
-static boolean validateServer(File file, String expected) {
- if (file == null || !file.exists()) {
- return false
- }
-
- def hash = Files.asByteSource(file).hash(Hashing.sha1())
- StringBuilder hashBuilder = new StringBuilder()
- hash.asBytes().each({hashBuilder.append(Integer.toString((it & 0xFF) + 0x100, 16).substring(1))})
- return hashBuilder.toString() == expected
-}
-
-File getServerJar(String version) {
- File manifestFile = this.downloadVersionManifest(version)
- Object manifest = new JsonSlurper().parse(manifestFile)
-
- File jarFile = new File(dataDirectory, "${version}/server.jar")
- if (!validateServer(jarFile, manifest.downloads.server.sha1)) {
- this.println("> Downloading ${version} server...")
- jarFile.getParentFile().mkdirs()
- FileUtils.copyURLToFile(new URL(manifest.downloads.server.url), jarFile)
- }
-
- return jarFile
-}
-
-File generateData(MinecraftVersion version) {
- File cache = getGeneratedCache(version)
- if (cache != null) {
- return cache
- }
-
- File jarFile = this.getServerJar(version.getVersionName())
- File targetDir = new File(jarFile.getParentFile(), "generated")
-
- try {
- FileUtils.deleteDirectory(targetDir)
- } catch (IOException ignored) {
- // Ignored.
- }
-
- String command
- if (version >= MinecraftVersion.MINECRAFT_1_18) {
- command = "\"%s\" -DbundlerMainClass=net.minecraft.data.Main -jar \"${jarFile.getAbsolutePath()}\" --reports --server"
- } else {
- command = "\"%s\" -cp \"${jarFile.getAbsolutePath()}\" net.minecraft.data.Main --reports --server"
- }
-
- exec {
- if (System.getProperty("os.name").toLowerCase().contains("win")) {
- File java = new File(System.getProperty("java.home"), "bin/java.exe")
- commandLine("cmd", "/c", String.format(command, java))
- } else {
- File java = new File(System.getProperty("java.home"), "bin/java")
- commandLine("bash", "-c", String.format(command, java))
- }
-
- workingDir(jarFile.getParentFile())
- }
-
- return targetDir
-}
-
-static Map> getDefaultProperties(Object data) {
- Map> defaultProperties = new HashMap<>()
-
- data.forEach({ key, block ->
- if (!block.containsKey("properties")) {
- return
- }
-
- for (Object blockState : block.states) {
- if (!blockState.containsKey("default") || !blockState.default) {
- continue
- }
-
- Map properties = blockState["properties"]
- defaultProperties.put(key, properties)
- break
- }
- })
-
- return defaultProperties
-}
-
-static Map> loadFallbackMapping(File file) {
- Object map = new JsonSlurper().parse(file)
- return MinecraftVersion.values().collectEntries({ version ->
- [version, map.getOrDefault(version.toString(), Collections.emptyMap())]
- })
-}
-
-static Map> loadLegacyMapping(File file) {
- return new JsonSlurper().parse(file).collectEntries({ version, mapping ->
- [MinecraftVersion.valueOf(version), mapping.collectEntries({ block, id ->
- [block, Integer.parseInt(id)]
- })]
- })
-}
-
-static int getBlockID(String block,
- Map> mappings,
- Map>> properties,
- Map> fallback,
- MinecraftVersion version) {
- Map> defaultProperties
- if (version >= MinecraftVersion.MINECRAFT_1_13) {
- defaultProperties = properties[version]
- } else {
- defaultProperties = properties[MinecraftVersion.MINECRAFT_1_18_2]
- }
-
- String[] split = block.split("\\[")
- String noArgBlock = split[0]
-
- MinecraftVersion fallbackVersion = MinecraftVersion.MAXIMUM_VERSION
- while (fallbackVersion != version) {
- --fallbackVersion
- noArgBlock = fallback[fallbackVersion].getOrDefault(noArgBlock, noArgBlock)
- }
-
- Map blockProperties = defaultProperties[noArgBlock]
- String targetBlockID
- if (blockProperties == null) {
- targetBlockID = noArgBlock
- } else {
- Map currentProperties = new TreeMap<>(blockProperties)
- if (split.length > 1) {
- String[] args = split[1].split(",")
- Map input = Arrays.stream(args)
- .map(arg -> arg.replace("]", "").split("="))
- .collect(Collectors.toMap(parts -> parts[0], parts -> parts[1]))
-
- input.forEach({ key, value ->
- if (currentProperties.containsKey(key)) {
- currentProperties.put(key, value)
- }
- })
- }
-
- targetBlockID = noArgBlock + Arrays.toString(
- currentProperties.collect({ k, v -> k + "=" + v }).toArray()
- ).replace(" ", "")
- }
-
- Integer id = mappings[version][targetBlockID]
- if (id == null && blockProperties != null) {
- targetBlockID = noArgBlock + Arrays.toString(
- new TreeMap<>(blockProperties).collect({ k, v -> k + "=" + v }).toArray()
- ).replace(" ", "")
- id = mappings[version][targetBlockID]
- }
-
- if (id == null) {
- System.err.println("No ${version.getVersionName()} fallback data for ${noArgBlock}, replacing with minecraft:stone")
- id = 1
- }
-
- return id
-}
-
-static Map getBlockMappings(Object data, Map> defaultPropertiesMap) {
- Map mapping = new HashMap<>()
-
- data.forEach({ blockID, blockData ->
- for (Object blockState : blockData.states) {
- int protocolID = blockState.id
-
- if (blockState.containsKey("properties")) {
- Map stateProperties = blockState["properties"]
- Map properties = new TreeMap<>(
- defaultPropertiesMap.getOrDefault(blockID, Collections.emptyMap()))
-
- properties.putAll(stateProperties)
-
- String stateID = blockID + Arrays.toString(
- properties.collect({ k, v -> k + "=" + v }).toArray()
- ).replace(" ", "")
-
- mapping.put(stateID, protocolID)
- } else {
- mapping.put(blockID, protocolID)
- }
- }
- })
-
- return mapping
-}
-
-void generateBlockMappings(File targetDir, Map blockReports) {
- File defaultBlockPropertiesFile = new File(targetDir, "defaultblockproperties.json")
- File blockStatesFile = new File(targetDir, "blockstates.json")
- File blockStatesMappingFile = new File(targetDir, "blockstates_mapping.json")
- File legacyBlocksFile = new File(targetDir, "legacyblocks.json")
-
- if (checkIsCacheValid(defaultBlockPropertiesFile) || checkIsCacheValid(blockStatesFile)
- || checkIsCacheValid(blockStatesMappingFile) || checkIsCacheValid(legacyBlocksFile)) {
- this.println("> Generating default block properties...")
-
- Map>> defaultProperties =
- blockReports.collectEntries({ version, report ->
- [version, getDefaultProperties(report)]
- })
-
- defaultBlockPropertiesFile.write(JsonOutput.prettyPrint(
- JsonOutput.toJson(defaultProperties[MinecraftVersion.MAXIMUM_VERSION].sort())), "UTF-8")
-
- this.println("> Generating blockstates...")
-
- Map> mappings = loadLegacyMapping(
- new File(this.getProjectDir(), "mapping/legacyblockmapping.json"))
-
- blockReports.forEach({ version, report ->
- mappings.put(version, getBlockMappings(report, defaultProperties[version]))
- })
-
- Map blocks = mappings[MinecraftVersion.MAXIMUM_VERSION]
-
- blockStatesFile.write(
- JsonOutput.prettyPrint(JsonOutput.toJson(
- blocks.sort(Map.Entry::getValue)
- .collectEntries({ k, v -> [k, String.valueOf(v)] })
- )), "UTF-8")
-
-
-
- this.println("> Generating blockstates mapping...")
-
- Map> fallbackMapping = loadFallbackMapping(
- new File(this.getProjectDir(), "mapping/fallbackdata.json"))
-
- Map> blockstateMapping = new LinkedHashMap<>()
- blocks.sort(Map.Entry::getValue)
- .forEach({ block, modernID ->
- Map blockMapping = new LinkedHashMap<>()
-
- int lastID = -1
- for (MinecraftVersion version : MinecraftVersion.values()) {
- int id = getBlockID(block, mappings, defaultProperties, fallbackMapping, version)
- if (lastID != id) {
- blockMapping.put(version.getVersionName(), String.valueOf(lastID = id))
- }
- }
-
- blockstateMapping.put(String.valueOf(modernID), blockMapping)
- })
-
- blockStatesMappingFile.write(
- JsonOutput.prettyPrint(JsonOutput.toJson(blockstateMapping)), "UTF-8")
-
- this.println("> Generating legacy blocks...")
-
- Map legacyData = new JsonSlurper().parse(
- new File(this.getProjectDir(), "mapping/legacyblocks.json"))
-
- legacyData = legacyData.collectEntries({ legacy, modern ->
- [legacy, String.valueOf(getBlockID(modern, mappings, defaultProperties, fallbackMapping, MinecraftVersion.MAXIMUM_VERSION))]
- })
-
- legacyBlocksFile.write(
- JsonOutput.prettyPrint(JsonOutput.toJson(legacyData)), "UTF-8")
- }
-}
-
-static Map> sortRegistryMapping(Map> mapping) {
- return mapping.collectEntries({ modernID, map ->
- [modernID, map.sort({
- if (it.getKey().contains(".")) {
- return MinecraftVersion.fromVersionName(it.getKey())
- } else {
- return MinecraftVersion.MINIMUM_VERSION
- }
- })]
- }).sort()
-}
-
-void generateRegistryMapping(String target, File targetDir, Map registriesReports) {
- File targetFile = new File(targetDir, "${target}s.json");
- File targetMappingFile = new File(targetDir, "${target}s_mapping.json");
- if (checkIsCacheValid(targetFile) || checkIsCacheValid(targetMappingFile)) {
- this.println("> Generating ${target}s...")
-
- Map> idMap =
- registriesReports.collectEntries({ version, registry ->
- Object entries = registry["minecraft:${target}"].entries
- return [version, entries.collectEntries({ name, id -> [name, String.valueOf(id["protocol_id"])] })]
- })
-
- Map modernIDs = Collections.max(idMap.entrySet(), Map.Entry.comparingByKey()).getValue()
-
- targetFile.write(JsonOutput.prettyPrint(
- JsonOutput.toJson(modernIDs.sort({Integer.parseInt(it.getValue()) }))), "UTF-8")
-
- this.println("> Generating ${target}s mapping...")
-
- Map> mapping = new JsonSlurper()
- .parse(new File(this.getProjectDir(), "mapping/legacy_${target}s_mapping.json"))
- .collectEntries({ key, value -> {
- if (modernIDs[key] == null) {
- throw new IllegalStateException("No modern id found for $key")
- }
-
- return [modernIDs[key], value]
- } })
-
- idMap.forEach({ version, ids ->
- ids.forEach({ key, id ->
- if (!modernIDs.containsKey(key)) {
- return
- }
-
- mapping.computeIfAbsent(modernIDs[key], _ -> new LinkedHashMap<>()).put(version.getVersionName(), id)
- })
- })
-
- mapping = sortRegistryMapping(mapping)
- targetMappingFile.write(JsonOutput.prettyPrint(
- JsonOutput.toJson(mapping.sort({ Integer.parseInt(it.getKey()) }))), "UTF-8")
- }
-}
-
-void generateRegistryMappings(File targetDir, Map registriesReports) {
- this.generateRegistryMapping("item", targetDir, registriesReports
- .findAll({ e -> MinecraftVersion.WORLD_VERSIONS.contains(e.getKey()) }))
- this.generateRegistryMapping("block", targetDir, registriesReports)
- this.generateRegistryMapping("data_component_type", targetDir, registriesReports
- .findAll({ e -> e.getKey() >= MinecraftVersion.MINECRAFT_1_20_5 }))
-
- File blockEntitiesMappingFile = new File(targetDir, "blockentities_mapping.json");
-
- if (checkIsCacheValid(blockEntitiesMappingFile)) {
- this.println("> Generating blockentities mapping...")
-
- Map> blockentities = new JsonSlurper()
- .parse(new File(this.getProjectDir(), "mapping/legacy_blockentities_mapping.json"))
-
- registriesReports.forEach({ version, registries ->
- if (version < MinecraftVersion.MINECRAFT_1_19) {
- return
- }
-
- registries["minecraft:block_entity_type"].entries.forEach({ key, value ->
- int id = value.protocol_id
- blockentities.computeIfAbsent(key, _ -> new LinkedHashMap<>())
- .put(version.getVersionName(), String.valueOf(id))
- })
- })
-
- blockentities = sortRegistryMapping(blockentities)
- blockEntitiesMappingFile.write(
- JsonOutput.prettyPrint(JsonOutput.toJson(blockentities)), "UTF-8")
- }
-}
-
-static Map>> getTags(File tagDir, Map tagTypes) {
- Map>> tags = new LinkedHashMap<>()
-
- tagTypes.forEach({ directory, key ->
- File directoryFile = new File(tagDir, directory)
- if (!directoryFile.exists()) {
- return
- }
-
- Map> typeTags = new HashMap<>()
- Map> tempTags = new HashMap<>()
-
- directoryFile.eachFileRecurse(FileType.FILES, { file ->
- List values = new JsonSlurper().parse(file).values
- Path relativePath = directoryFile.toPath().relativize(file.toPath())
- String name = FilenameUtils.removeExtension(relativePath.toString()).replace(File.separatorChar, '/' as char)
- typeTags.put("minecraft:" + name, values)
- })
-
- boolean flatten = false
- while (!flatten) {
- flatten = true
-
- typeTags.forEach({ name, currentTags ->
- List newTags = new ArrayList<>()
- currentTags.forEach({ currentTag ->
- if (currentTag.startsWith("#")) {
- newTags.addAll(typeTags.get(currentTag.substring(1)))
- flatten = false
- } else {
- newTags.add(currentTag)
- }
- })
-
- tempTags.put(name, newTags)
- })
-
- typeTags = tempTags
- tempTags = new HashMap<>()
- }
-
- tags.put(key, typeTags)
- })
-
- return tags
-}
-
-void generateTags(File targetDir, Map tagDirs) {
- File tagsFile = new File(targetDir, "tags.json");
- if (checkIsCacheValid(tagsFile)) {
- this.println("> Generating tags...")
-
- Map tagTypes = new JsonSlurper().parse(new File(getProjectDir(), "mapping/tag_types.json"))
-
- Map>>> allTags =
- tagDirs.collectEntries({ version, dir ->
- [version, getTags(dir, tagTypes.tag_types)]
- })
-
- Map>> mergedTags = new LinkedHashMap<>()
-
- allTags.forEach({ version, tags ->
- tags.forEach({ type, typeTags -> {
- Map> mergedTypeTags = mergedTags.computeIfAbsent(type, _ -> new HashMap<>())
- typeTags.forEach({ name, values ->
- Set mergedValues = mergedTypeTags.computeIfAbsent(name, _ -> new HashSet<>())
- if (!tagTypes.supported_tag_types.contains(type)) {
- return
- }
-
- mergedValues.addAll(values)
- })
- }})
- })
-
- mergedTags = mergedTags.collectEntries({ type, typeTags ->
- [type, typeTags.collectEntries({ name, values ->
- [name, values.sort()]
- }).sort()]
- })
-
- tagsFile.write(JsonOutput.prettyPrint(JsonOutput.toJson(mergedTags)), "UTF-8")
- }
-}
-
-tasks.register("generateMappings") {
- dependsOn(downloadManifest)
-
- File targetDir = new File(generatedDir, "mapping")
- targetDir.mkdirs()
-
- this.println("> Generating Minecraft data...")
-
- Map generated = Arrays.stream(MinecraftVersion.values())
- .dropWhile({ it < MinecraftVersion.MINECRAFT_1_13 })
- .collect(Collectors.toMap(Function.identity(), this::generateData))
-
- Map blockReports = generated.collectEntries({ version, directory ->
- [version, new JsonSlurper().parse(new File(directory, "reports/blocks.json"))]
- })
+ annotationProcessor(libs.velocity.api)
+ compileOnly("com.velocitypowered:velocity-proxy:3.4.0-SNAPSHOT") // From Elytrium repo
+ compileOnly("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT")
- this.generateBlockMappings(targetDir, blockReports)
+ compileOnly("io.netty:netty-codec:4.1.86.Final")
+ compileOnly("io.netty:netty-handler:4.1.86.Final")
+ compileOnly("it.unimi.dsi:fastutil-core:8.5.11")
- Map registriesReports = generated
- .findAll({ it.getKey() >= MinecraftVersion.MINECRAFT_1_14 })
- .collectEntries({ version, directory ->
- [version, new JsonSlurper().parse(new File(directory, "reports/registries.json"))]
- })
+ compileOnly(project(":api"))
+ // TODO remove
+ shadowApi("net.elytrium.commons:config:1.2.3")
+ shadowApi("net.elytrium.commons:kyori:1.2.3")
- this.generateRegistryMappings(targetDir, registriesReports)
+ shadowApi("net.elytrium:fastprepare:1.0.13")
- Map tags = generated
- .collectEntries({ version, directory ->
- [version, new File(directory, "data/minecraft/tags")]
- })
+ shadowApi("org.bstats:bstats-velocity:3.0.0")
- this.generateTags(targetDir, tags)
+ compileOnly("com.github.spotbugs:spotbugs-annotations:4.7.3")
}
-processResources.dependsOn(generateMappings)
\ No newline at end of file
+//license() {
+// matching(includes: ["**/mcprotocollib/**"]) {
+// setHeader(getRootProject().file("HEADER_MCPROTOCOLLIB.txt"))
+// }
+// matching(includes: ["**/LoginListener.java", "**/LoginTasksQueue.java", "**/MinecraftLimitedCompressDecoder.java"]) {
+// setHeader(getRootProject().file("HEADER_MIXED.txt"))
+// }
+//
+// setHeader(getRootProject().file("HEADER.txt"))
+//}
diff --git a/plugin/mapping/legacy_blockentities_mapping.json b/plugin/mapping/legacy_blockentities_mapping.json
deleted file mode 100644
index c5d3ea3f..00000000
--- a/plugin/mapping/legacy_blockentities_mapping.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "minecraft:banner": {
- "legacy": "18"
- },
- "minecraft:barrel": {
- "legacy": "25"
- },
- "minecraft:beacon": {
- "legacy": "13"
- },
- "minecraft:bed": {
- "legacy": "23"
- },
- "minecraft:beehive": {
- "legacy": "32"
- },
- "minecraft:bell": {
- "legacy": "29"
- },
- "minecraft:blast_furnace": {
- "legacy": "27"
- },
- "minecraft:brewing_stand": {
- "legacy": "10"
- },
- "minecraft:campfire": {
- "legacy": "31"
- },
- "minecraft:chest": {
- "legacy": "1"
- },
- "minecraft:chiseled_bookshelf": {
- "legacy": "36"
- },
- "minecraft:command_block": {
- "legacy": "21"
- },
- "minecraft:comparator": {
- "legacy": "17"
- },
- "minecraft:conduit": {
- "legacy": "24"
- },
- "minecraft:daylight_detector": {
- "legacy": "15"
- },
- "minecraft:dispenser": {
- "legacy": "5"
- },
- "minecraft:dropper": {
- "legacy": "6"
- },
- "minecraft:enchanting_table": {
- "legacy": "11"
- },
- "minecraft:end_gateway": {
- "legacy": "20"
- },
- "minecraft:end_portal": {
- "legacy": "12"
- },
- "minecraft:ender_chest": {
- "legacy": "3"
- },
- "minecraft:furnace": {
- "legacy": "0"
- },
- "minecraft:hanging_sign": {
- "legacy": "7"
- },
- "minecraft:hopper": {
- "legacy": "16"
- },
- "minecraft:jigsaw": {
- "legacy": "30"
- },
- "minecraft:jukebox": {
- "legacy": "4"
- },
- "minecraft:lectern": {
- "legacy": "28"
- },
- "minecraft:mob_spawner": {
- "legacy": "8"
- },
- "minecraft:piston": {
- "legacy": "9"
- },
- "minecraft:sculk_catalyst": {
- "legacy": "34"
- },
- "minecraft:sculk_sensor": {
- "legacy": "33"
- },
- "minecraft:sculk_shrieker": {
- "legacy": "35"
- },
- "minecraft:shulker_box": {
- "legacy": "22"
- },
- "minecraft:sign": {
- "legacy": "7"
- },
- "minecraft:skull": {
- "legacy": "14"
- },
- "minecraft:smoker": {
- "legacy": "26"
- },
- "minecraft:structure_block": {
- "legacy": "19"
- },
- "minecraft:trapped_chest": {
- "legacy": "2"
- }
-}
\ No newline at end of file
diff --git a/plugin/mapping/fallbackdata.json b/plugin/mappings/fallback_data.json
old mode 100755
new mode 100644
similarity index 99%
rename from plugin/mapping/fallbackdata.json
rename to plugin/mappings/fallback_data.json
index b2177026..7f010f63
--- a/plugin/mapping/fallbackdata.json
+++ b/plugin/mappings/fallback_data.json
@@ -427,7 +427,7 @@
"minecraft:bee_nest": "minecraft:birch_planks",
"minecraft:beehive": "minecraft:birch_planks",
"minecraft:honeycomb_block": "minecraft:yellow_glazed_terracotta",
- "minecraft:honey_block": "minecraft:yellow_stained_glass"
+ "minecraft:honey_block": "minecraft:yellow_stained_glass"
},
"MINECRAFT_1_13_2": {
"minecraft:lily_of_the_valley": "minecraft:white_tulip",
diff --git a/plugin/mappings/legacy_block_entity_types_mappings.json b/plugin/mappings/legacy_block_entity_types_mappings.json
new file mode 100644
index 00000000..b395147e
--- /dev/null
+++ b/plugin/mappings/legacy_block_entity_types_mappings.json
@@ -0,0 +1,130 @@
+{
+ "minecraft:banner": {
+ "1.11": 19,
+ "1.12": 19,
+ "1.13": 18
+ },
+ "minecraft:beacon": {
+ "1.11": 13,
+ "1.12": 13,
+ "1.13": 13
+ },
+ "minecraft:bed": {
+ "1.12": 24,
+ "1.13": 23
+ },
+ "minecraft:brewing_stand": {
+ "1.11": 10,
+ "1.12": 10,
+ "1.13": 10
+ },
+ "minecraft:chest": {
+ "1.11": 1,
+ "1.12": 1,
+ "1.13": 1
+ },
+ "minecraft:command_block": {
+ "1.11": 22,
+ "1.12": 22,
+ "1.13": 21
+ },
+ "minecraft:comparator": {
+ "1.11": 17,
+ "1.12": 17,
+ "1.13": 17
+ },
+ "minecraft:conduit": {
+ "1.13": 24
+ },
+ "minecraft:daylight_detector": {
+ "1.11": 15,
+ "1.12": 15,
+ "1.13": 15
+ },
+ "minecraft:dispenser": {
+ "1.11": 4,
+ "1.12": 4,
+ "1.13": 5
+ },
+ "minecraft:dropper": {
+ "1.11": 5,
+ "1.12": 5,
+ "1.13": 6
+ },
+ "minecraft:enchanting_table": {
+ "1.11": 11,
+ "1.12": 11,
+ "1.13": 11
+ },
+ "minecraft:end_gateway": {
+ "1.11": 21,
+ "1.12": 21,
+ "1.13": 20
+ },
+ "minecraft:end_portal": {
+ "1.11": 12,
+ "1.12": 12,
+ "1.13": 12
+ },
+ "minecraft:ender_chest": {
+ "1.11": 2,
+ "1.12": 2,
+ "1.13": 3
+ },
+ "minecraft:flower_pot": {
+ "1.11": 18,
+ "1.12": 18
+ },
+ "minecraft:furnace": {
+ "1.11": 0,
+ "1.12": 0,
+ "1.13": 0
+ },
+ "minecraft:hopper": {
+ "1.11": 16,
+ "1.12": 16,
+ "1.13": 16
+ },
+ "minecraft:jukebox": {
+ "1.11": 3,
+ "1.12": 3,
+ "1.13": 4
+ },
+ "minecraft:mob_spawner": {
+ "1.11": 7,
+ "1.12": 7,
+ "1.13": 8
+ },
+ "minecraft:noteblock": {
+ "1.11": 8,
+ "1.12": 8
+ },
+ "minecraft:piston": {
+ "1.11": 9,
+ "1.12": 9,
+ "1.13": 9
+ },
+ "minecraft:shulker_box": {
+ "1.11": 23,
+ "1.12": 23,
+ "1.13": 22
+ },
+ "minecraft:sign": {
+ "1.11": 6,
+ "1.12": 6,
+ "1.13": 7
+ },
+ "minecraft:skull": {
+ "1.11": 14,
+ "1.12": 14,
+ "1.13": 14
+ },
+ "minecraft:structure_block": {
+ "1.11": 20,
+ "1.12": 20,
+ "1.13": 19
+ },
+ "minecraft:trapped_chest": {
+ "1.13": 2
+ }
+}
\ No newline at end of file
diff --git a/plugin/mapping/legacyblockmapping.json b/plugin/mappings/legacy_block_mappings.json
old mode 100755
new mode 100644
similarity index 100%
rename from plugin/mapping/legacyblockmapping.json
rename to plugin/mappings/legacy_block_mappings.json
diff --git a/plugin/mapping/legacyblocks.json b/plugin/mappings/legacy_blocks.json
similarity index 100%
rename from plugin/mapping/legacyblocks.json
rename to plugin/mappings/legacy_blocks.json
diff --git a/plugin/mapping/legacy_blocks_mapping.json b/plugin/mappings/legacy_blocks_mappings.json
similarity index 100%
rename from plugin/mapping/legacy_blocks_mapping.json
rename to plugin/mappings/legacy_blocks_mappings.json
diff --git a/plugin/mapping/legacy_data_component_types_mapping.json b/plugin/mappings/legacy_data_component_types_mappings.json
similarity index 100%
rename from plugin/mapping/legacy_data_component_types_mapping.json
rename to plugin/mappings/legacy_data_component_types_mappings.json
diff --git a/plugin/mapping/legacy_items_mapping.json b/plugin/mappings/legacy_items_mappings.json
similarity index 100%
rename from plugin/mapping/legacy_items_mapping.json
rename to plugin/mappings/legacy_items_mappings.json
diff --git a/plugin/mappings/legacy_particle_types_mappings.json b/plugin/mappings/legacy_particle_types_mappings.json
new file mode 100644
index 00000000..ae8f35bf
--- /dev/null
+++ b/plugin/mappings/legacy_particle_types_mappings.json
@@ -0,0 +1,252 @@
+{
+ "minecraft:ambient_entity_effect": {
+ "1.13": "0",
+ "1.13.1": "0",
+ "1.13.2": "0"
+ },
+ "minecraft:angry_villager": {
+ "1.13": "1",
+ "1.13.1": "1",
+ "1.13.2": "1"
+ },
+ "minecraft:barrier": {
+ "1.13": "2",
+ "1.13.1": "2",
+ "1.13.2": "2"
+ },
+ "minecraft:block": {
+ "1.13": "3",
+ "1.13.1": "3",
+ "1.13.2": "3"
+ },
+ "minecraft:bubble": {
+ "1.13": "4",
+ "1.13.1": "4",
+ "1.13.2": "4"
+ },
+ "minecraft:cloud": {
+ "1.13": "5",
+ "1.13.1": "5",
+ "1.13.2": "5"
+ },
+ "minecraft:crit": {
+ "1.13": "6",
+ "1.13.1": "6",
+ "1.13.2": "6"
+ },
+ "minecraft:damage_indicator": {
+ "1.13": "7",
+ "1.13.1": "7",
+ "1.13.2": "7"
+ },
+ "minecraft:dragon_breath": {
+ "1.13": "8",
+ "1.13.1": "8",
+ "1.13.2": "8"
+ },
+ "minecraft:dripping_lava": {
+ "1.13": "9",
+ "1.13.1": "9",
+ "1.13.2": "9"
+ },
+ "minecraft:dripping_water": {
+ "1.13": "10",
+ "1.13.1": "10",
+ "1.13.2": "10"
+ },
+ "minecraft:dust": {
+ "1.13": "11",
+ "1.13.1": "11",
+ "1.13.2": "11"
+ },
+ "minecraft:effect": {
+ "1.13": "12",
+ "1.13.1": "12",
+ "1.13.2": "12"
+ },
+ "minecraft:elder_guardian": {
+ "1.13": "13",
+ "1.13.1": "13",
+ "1.13.2": "13"
+ },
+ "minecraft:enchanted_hit": {
+ "1.13": "14",
+ "1.13.1": "14",
+ "1.13.2": "14"
+ },
+ "minecraft:enchant": {
+ "1.13": "15",
+ "1.13.1": "15",
+ "1.13.2": "15"
+ },
+ "minecraft:end_rod": {
+ "1.13": "16",
+ "1.13.1": "16",
+ "1.13.2": "16"
+ },
+ "minecraft:entity_effect": {
+ "1.13": "17",
+ "1.13.1": "17",
+ "1.13.2": "17"
+ },
+ "minecraft:explosion_emitter": {
+ "1.13": "18",
+ "1.13.1": "18",
+ "1.13.2": "18"
+ },
+ "minecraft:explosion": {
+ "1.13": "19",
+ "1.13.1": "19",
+ "1.13.2": "19"
+ },
+ "minecraft:falling_dust": {
+ "1.13": "20",
+ "1.13.1": "20",
+ "1.13.2": "20"
+ },
+ "minecraft:firework": {
+ "1.13": "21",
+ "1.13.1": "21",
+ "1.13.2": "21"
+ },
+ "minecraft:fishing": {
+ "1.13": "22",
+ "1.13.1": "22",
+ "1.13.2": "22"
+ },
+ "minecraft:flame": {
+ "1.13": "23",
+ "1.13.1": "23",
+ "1.13.2": "23"
+ },
+ "minecraft:happy_villager": {
+ "1.13": "24",
+ "1.13.1": "24",
+ "1.13.2": "24"
+ },
+ "minecraft:heart": {
+ "1.13": "25",
+ "1.13.1": "25",
+ "1.13.2": "25"
+ },
+ "minecraft:instant_effect": {
+ "1.13": "26",
+ "1.13.1": "26",
+ "1.13.2": "26"
+ },
+ "minecraft:item": {
+ "1.13": "27",
+ "1.13.1": "27",
+ "1.13.2": "27"
+ },
+ "minecraft:item_slime": {
+ "1.13": "28",
+ "1.13.1": "28",
+ "1.13.2": "28"
+ },
+ "minecraft:item_snowball": {
+ "1.13": "29",
+ "1.13.1": "29",
+ "1.13.2": "29"
+ },
+ "minecraft:large_smoke": {
+ "1.13": "30",
+ "1.13.1": "30",
+ "1.13.2": "30"
+ },
+ "minecraft:lava": {
+ "1.13": "31",
+ "1.13.1": "31",
+ "1.13.2": "31"
+ },
+ "minecraft:mycelium": {
+ "1.13": "32",
+ "1.13.1": "32",
+ "1.13.2": "32"
+ },
+ "minecraft:note": {
+ "1.13": "33",
+ "1.13.1": "33",
+ "1.13.2": "33"
+ },
+ "minecraft:poof": {
+ "1.13": "34",
+ "1.13.1": "34",
+ "1.13.2": "34"
+ },
+ "minecraft:portal": {
+ "1.13": "35",
+ "1.13.1": "35",
+ "1.13.2": "35"
+ },
+ "minecraft:rain": {
+ "1.13": "36",
+ "1.13.1": "36",
+ "1.13.2": "36"
+ },
+ "minecraft:smoke": {
+ "1.13": "37",
+ "1.13.1": "37",
+ "1.13.2": "37"
+ },
+ "minecraft:spit": {
+ "1.13": "38",
+ "1.13.1": "38",
+ "1.13.2": "38"
+ },
+ "minecraft:squid_ink": {
+ "1.13": "39",
+ "1.13.1": "39",
+ "1.13.2": "39"
+ },
+ "minecraft:sweep_attack": {
+ "1.13": "40",
+ "1.13.1": "40",
+ "1.13.2": "40"
+ },
+ "minecraft:totem_of_undying": {
+ "1.13": "41",
+ "1.13.1": "41",
+ "1.13.2": "41"
+ },
+ "minecraft:underwater": {
+ "1.13": "42",
+ "1.13.1": "42",
+ "1.13.2": "42"
+ },
+ "minecraft:splash": {
+ "1.13": "43",
+ "1.13.1": "43",
+ "1.13.2": "43"
+ },
+ "minecraft:witch": {
+ "1.13": "44",
+ "1.13.1": "44",
+ "1.13.2": "44"
+ },
+ "minecraft:bubble_pop": {
+ "1.13": "45",
+ "1.13.1": "45",
+ "1.13.2": "45"
+ },
+ "minecraft:current_down": {
+ "1.13": "46",
+ "1.13.1": "46",
+ "1.13.2": "46"
+ },
+ "minecraft:bubble_column_up": {
+ "1.13": "47",
+ "1.13.1": "47",
+ "1.13.2": "47"
+ },
+ "minecraft:nautilus": {
+ "1.13": "48",
+ "1.13.1": "48",
+ "1.13.2": "48"
+ },
+ "minecraft:dolphin": {
+ "1.13": "49",
+ "1.13.1": "49",
+ "1.13.2": "49"
+ }
+}
\ No newline at end of file
diff --git a/plugin/mapping/tag_types.json b/plugin/mappings/tag_types.json
similarity index 100%
rename from plugin/mapping/tag_types.json
rename to plugin/mappings/tag_types.json
diff --git a/plugin/mappings_generator.gradle b/plugin/mappings_generator.gradle
new file mode 100644
index 00000000..f04e1026
--- /dev/null
+++ b/plugin/mappings_generator.gradle
@@ -0,0 +1,454 @@
+import groovy.io.FileType
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.transform.Field
+import java.security.MessageDigest
+
+enum MinecraftVersion {
+
+ MINECRAFT_1_7_2(4),
+ MINECRAFT_1_7_6(5),
+ MINECRAFT_1_8(47),
+ MINECRAFT_1_9(107),
+ MINECRAFT_1_9_1(108),
+ MINECRAFT_1_9_2(109),
+ MINECRAFT_1_9_4(110),
+ MINECRAFT_1_10(210),
+ MINECRAFT_1_11(315),
+ MINECRAFT_1_11_1(316),
+ MINECRAFT_1_12(335),
+ MINECRAFT_1_12_1(338),
+ MINECRAFT_1_12_2(340),
+ MINECRAFT_1_13(393),
+ MINECRAFT_1_13_1(401),
+ MINECRAFT_1_13_2(404),
+ MINECRAFT_1_14(477),
+ MINECRAFT_1_14_1(480),
+ MINECRAFT_1_14_2(485),
+ MINECRAFT_1_14_3(490),
+ MINECRAFT_1_14_4(498),
+ MINECRAFT_1_15(573),
+ MINECRAFT_1_15_1(575),
+ MINECRAFT_1_15_2(578),
+ MINECRAFT_1_16(735),
+ MINECRAFT_1_16_1(736),
+ MINECRAFT_1_16_2(751),
+ MINECRAFT_1_16_3(753),
+ MINECRAFT_1_16_4(754),
+ MINECRAFT_1_17(755),
+ MINECRAFT_1_17_1(756),
+ MINECRAFT_1_18(757),
+ MINECRAFT_1_18_2(758),
+ MINECRAFT_1_19(759),
+ MINECRAFT_1_19_1(760),
+ MINECRAFT_1_19_3(761),
+ MINECRAFT_1_19_4(762),
+ MINECRAFT_1_20(763),
+ MINECRAFT_1_20_2(764),
+ MINECRAFT_1_20_3(765),
+ MINECRAFT_1_20_5(766),
+ MINECRAFT_1_21(767),
+ MINECRAFT_1_21_2(768)
+
+ public static final List BLOCK_ENTITY_VERSIONS = List.of(
+ MINECRAFT_1_13,
+ MINECRAFT_1_14,
+ MINECRAFT_1_15,
+ MINECRAFT_1_17,
+ MINECRAFT_1_19,
+ MINECRAFT_1_19_3,
+ MINECRAFT_1_19_4,
+ MINECRAFT_1_20,
+ MINECRAFT_1_20_3,
+ MINECRAFT_1_20_5,
+ MINECRAFT_1_21_2
+ )
+
+ public static final List WORLD_VERSIONS = List.of(
+ MINECRAFT_1_13,
+ MINECRAFT_1_13_2,
+ MINECRAFT_1_14,
+ MINECRAFT_1_15,
+ MINECRAFT_1_16,
+ MINECRAFT_1_16_2,
+ MINECRAFT_1_17,
+ MINECRAFT_1_19,
+ MINECRAFT_1_19_3,
+ MINECRAFT_1_19_4,
+ MINECRAFT_1_20,
+ MINECRAFT_1_20_3,
+ MINECRAFT_1_20_5,
+ MINECRAFT_1_21_2
+ )
+
+ public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2
+ public static final MinecraftVersion MAXIMUM_VERSION = values()[values().length - 1]
+
+ static MinecraftVersion fromVersionName(String name) {
+ return name.equalsIgnoreCase("legacy") ? MINIMUM_VERSION : valueOf("MINECRAFT_" + name.replace('.', '_'))
+ }
+
+ // Cache version name to reduce memory usage in general
+ final String versionName = this.toString().substring(10).replace('_', '.')
+ final int protocolVersion
+
+ MinecraftVersion(int protocolVersion) {
+ this.protocolVersion = protocolVersion
+ }
+
+ String getVersionName() {
+ return this.versionName
+ }
+}
+
+ext() {
+ File buildDirectory = this.getLayout().getBuildDirectory().get().getAsFile()
+ dataDirectory = new File(buildDirectory, "minecraft")
+ generatedDir = new File(buildDirectory, "generated/minecraft")
+ versionManifestFile = new File(dataDirectory, "manifest.json")
+}
+
+sourceSets.main.resources.srcDirs(generatedDir)
+
+tasks.register("downloadManifest") {
+ this.println("> Downloading version manifest...")
+ versionManifestFile.getParentFile().mkdirs()
+ if (checkIsCacheValid(versionManifestFile)) {
+ new URL(manifestUrl).openStream().transferTo(new FileOutputStream(versionManifestFile))
+ }
+}
+
+boolean checkIsCacheValid(File file) {
+ if (file.exists() && System.currentTimeMillis() - file.lastModified() < Long.parseLong(cacheValidMillis)) {
+ println("> Found cached " + file.getName())
+ return false
+ }
+
+ return true
+}
+
+@Field static final JsonSlurper SLURPER = new JsonSlurper()
+
+File downloadVersionManifest(String version) {
+ this.println("> Downloading ${version} manifest...")
+
+ File output = new File(dataDirectory, "${version}/manifest.json")
+ output.getParentFile().mkdirs()
+ for (Map versionInfo : (List>) SLURPER.parse(versionManifestFile, "UTF-8")["versions"]) {
+ if (versionInfo["id"] == version) {
+ new URL(versionInfo["url"]).openStream().transferTo(new FileOutputStream(output))
+ return output
+ }
+ }
+
+ throw new IllegalArgumentException(version)
+}
+
+@SuppressWarnings("GrMethodMayBeStatic")
+File getGeneratedCache(MinecraftVersion version) {
+ File generated = new File(dataDirectory, "${version.getVersionName()}/generated")
+ return new File(generated, "reports/blocks.json").exists()
+ && new File(generated, "reports/${version >= MinecraftVersion.MINECRAFT_1_14 ? "registries" : "items"}.json").exists()
+ && new File(generated, "data/minecraft/tags").exists()
+ ? generated : null
+}
+
+static boolean validateServer(File file, String expected) {
+ if (file == null || !file.exists()) {
+ return false
+ }
+
+ MessageDigest messageDigest = MessageDigest.getInstance("SHA1")
+ file.eachByte(1024 * 1024, (byte[] buf, int bytesRead) -> messageDigest.update(buf, 0, bytesRead))
+ return new BigInteger(1, messageDigest.digest()).toString(16).padLeft(40, '0') == expected
+}
+
+File getServerJar(String version) {
+ File jarFile = new File(dataDirectory, "${version}/server.jar")
+ Map server = (Map) SLURPER.parse(this.downloadVersionManifest(version), "UTF-8")["downloads"]["server"]
+ if (!validateServer(jarFile, server["sha1"])) {
+ this.println("> Downloading ${version} server...")
+ jarFile.getParentFile().mkdirs()
+ new URL(server["url"]).openStream().transferTo(new FileOutputStream(jarFile))
+ }
+
+ return jarFile
+}
+
+File generateData(MinecraftVersion version) {
+ File cache = getGeneratedCache(version)
+ if (cache != null) {
+ return cache
+ }
+
+ File jarFile = this.getServerJar(version.getVersionName())
+ File targetDir = new File(jarFile.getParentFile(), "generated")
+
+ targetDir.deleteDir()
+
+ String command = version >= MinecraftVersion.MINECRAFT_1_18
+ ? "\"%s\" -DbundlerMainClass=net.minecraft.data.Main -jar \"${jarFile.getAbsolutePath()}\" --reports --server"
+ : "\"%s\" -cp \"${jarFile.getAbsolutePath()}\" net.minecraft.data.Main --reports --server"
+ exec() {
+ String javaHome = System.getProperty("java.home")
+ if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows")) {
+ commandLine("cmd", "/c", String.format(command, new File(javaHome, "bin/java.exe")))
+ } else {
+ commandLine("bash", "-c", String.format(command, new File(javaHome, "bin/java")))
+ }
+
+ workingDir(jarFile.getParentFile())
+ }
+
+ return targetDir
+}
+
+static Map> getDefaultProperties(Map> data) {
+ Map> defaultProperties = new TreeMap<>(Comparator.naturalOrder())
+ data.forEach((key, block) -> {
+ if (!block.containsKey("properties")) {
+ return
+ }
+
+ for (Map blockState : (List>) block["states"]) {
+ if (blockState["default"]) {
+ defaultProperties[key] = (Map) blockState["properties"]
+ break
+ }
+ }
+ })
+ return defaultProperties
+}
+
+static Map> loadFallbackMappings(File file) {
+ Map> fallbackMappings = (Map>) SLURPER.parse(file, "UTF-8")
+ return MinecraftVersion.values().collectEntries(version -> [version, fallbackMappings.getOrDefault(version.toString(), Collections.emptyMap())])
+}
+
+static Map> loadLegacyMappings(File file) {
+ Map> legacyMappings = (Map>) SLURPER.parse(file, "UTF-8")
+ return legacyMappings.collectEntries((version, mappings) -> [MinecraftVersion.valueOf(version), mappings.collectEntries((block, id) -> [block, Integer.parseInt(id)])])
+}
+
+static int getBlockId(String block, MinecraftVersion version,
+ Map> mappings, Map>> properties, Map> fallback) {
+ Map> defaultProperties = version >= MinecraftVersion.MINECRAFT_1_13 ? properties[version] : properties[MinecraftVersion.MINECRAFT_1_18_2]
+
+ String[] split = block.split("\\[")
+ String noArgBlock = split[0]
+
+ MinecraftVersion fallbackVersion = MinecraftVersion.MAXIMUM_VERSION
+ while (fallbackVersion != version) {
+ --fallbackVersion
+ noArgBlock = fallback[fallbackVersion].getOrDefault(noArgBlock, noArgBlock)
+ }
+
+ String targetBlockId = noArgBlock
+ Map blockProperties = defaultProperties[noArgBlock]
+ if (blockProperties != null) {
+ Map currentProperties = new TreeMap<>(Comparator.naturalOrder())
+ currentProperties.putAll(blockProperties)
+ if (split.length > 1) {
+ for (String argument in split[1].split(",")) {
+ String[] parts = argument.replace("]", "").split("=")
+ if (currentProperties.containsKey(parts[0])) {
+ currentProperties[parts[0]] = parts[1]
+ }
+ }
+ }
+
+ targetBlockId += Arrays.toString(currentProperties.collect((key, value) -> key + "=" + value).toArray()).replace(" ", "")
+ }
+
+ Integer id = mappings[version][targetBlockId]
+ if (id == null && blockProperties != null) {
+ id = mappings[version][noArgBlock + Arrays.toString(new TreeMap<>(blockProperties).collect((key, value) -> key + "=" + value).toArray()).replace(" ", "")]
+ }
+
+ if (id == null) {
+ System.err.println("No ${version.getVersionName()} fallback data for ${noArgBlock}, replacing with minecraft:stone")
+ id = 1
+ }
+
+ return id
+}
+
+static Map getBlockMappings(Map>>> data, Map> defaultPropertiesMap) {
+ Map mappings = new TreeMap<>(Comparator.naturalOrder())
+ data.forEach((blockId, blockData) -> {
+ for (Map blockState : blockData.states) {
+ Map stateProperties = (Map) blockState["properties"]
+ if (stateProperties) {
+ Map properties = new TreeMap<>(defaultPropertiesMap.getOrDefault(blockId, Collections.emptyMap()))
+ properties.putAll(stateProperties)
+ mappings[blockId + Arrays.toString(properties.collect((key, value) -> key + "=" + value).toArray()).replace(" ", "")] = (Integer) blockState["id"]
+ } else {
+ mappings[blockId] = (Integer) blockState["id"]
+ }
+ }
+ })
+ return mappings
+}
+
+void generateBlockMappings(File targetDir, Map>>>> blockReports) {
+ File defaultBlockPropertiesFile = new File(targetDir, "default_block_properties.json")
+ File blockStatesFile = new File(targetDir, "block_states.json")
+ File blockStatesMappingsFile = new File(targetDir, "block_states_mappings.json")
+ File legacyBlocksFile = new File(targetDir, "legacy_blocks.json")
+ if (checkIsCacheValid(defaultBlockPropertiesFile) || checkIsCacheValid(blockStatesFile) || checkIsCacheValid(blockStatesMappingsFile) || checkIsCacheValid(legacyBlocksFile)) {
+ this.println("> Generating default block properties...")
+ Map>> defaultProperties = blockReports.collectEntries((version, report) -> [version, getDefaultProperties(report)])
+ defaultBlockPropertiesFile.write(JsonOutput.toJson(defaultProperties[MinecraftVersion.MAXIMUM_VERSION]), "UTF-8")
+
+ this.println("> Generating block_states...")
+ Map> mappings = loadLegacyMappings(new File(this.getProjectDir(), "mappings/legacy_block_mappings.json"))
+ blockReports.forEach((version, report) -> mappings.put(version, getBlockMappings(report, defaultProperties[version])))
+ Map blocks = mappings[MinecraftVersion.MAXIMUM_VERSION]
+ blockStatesFile.write(JsonOutput.toJson(blocks), "UTF-8")
+
+ this.println("> Generating block_states mappings...")
+ Map> fallback = loadFallbackMappings(new File(this.getProjectDir(), "mappings/fallback_data.json"))
+ Map> blockStateMappings = new TreeMap<>(Integer::compare)
+ blocks.forEach((block, modernId) -> {
+ Map blockMappings = new TreeMap<>(Integer::compare)
+ int lastId = -1
+ for (MinecraftVersion version : MinecraftVersion.values()) {
+ int id = getBlockId(block, version, mappings, defaultProperties, fallback)
+ if (lastId != id) {
+ blockMappings[version.protocolVersion] = lastId = id
+ }
+ }
+
+ blockStateMappings[modernId] = blockMappings
+ })
+ blockStatesMappingsFile.write(JsonOutput.toJson(blockStateMappings), "UTF-8")
+
+ this.println("> Generating legacy blocks...")
+ Map legacyData = (Map) SLURPER.parse(new File(this.getProjectDir(), "mappings/legacy_blocks.json"), "UTF-8")
+ legacyData.remove("0") // Remove AIR
+ legacyBlocksFile.write(JsonOutput.toJson(legacyData.collectEntries((legacy, modern) -> [legacy, getBlockId(modern, MinecraftVersion.MAXIMUM_VERSION, mappings, defaultProperties, fallback)])), "UTF-8")
+ }
+}
+
+/**
+ * @param excludeLegacy Entries that isn't present in the latest version will be excluded (e.g. minecraft:grass_path will be excluded because it exists only on 1.14-1.16.2)
+ */
+void generateRegistryMappings(String target, File targetDir, Map>>>> registryReports, boolean excludeLegacy) {
+ File targetMappingsFile = new File(targetDir, "${target}s_mappings.json")
+ if (checkIsCacheValid(targetMappingsFile)) {
+ this.println("> Generating ${target}s mappings...")
+
+ Map> mappings = new TreeMap<>(Comparator.naturalOrder())
+
+ def legacyMappings = (Map>) SLURPER.parse(new File(this.getProjectDir(), "mappings/legacy_${target}s_mappings.json"), "UTF-8")
+ mappings.putAll(legacyMappings.collectEntries((key, value) -> [key, value.collectEntries((version, id) -> [MinecraftVersion.fromVersionName(version).protocolVersion, id])]))
+
+ registryReports.forEach((version, registry) -> registry["minecraft:${target}"]["entries"].forEach(
+ (name, value) -> mappings.computeIfAbsent(name, _ -> new TreeMap<>(Integer::compare))[version.protocolVersion] = value["protocol_id"]
+ ))
+
+ if (excludeLegacy) {
+ int max = Collections.max(registryReports.keySet()).protocolVersion
+ mappings.entrySet().removeIf(entry -> !entry.getValue().containsKey(max))
+ }
+
+ mappings.forEach((name, map) -> map.replaceAll((version, id) -> id instanceof String ? Integer.parseInt(id) : id))
+ targetMappingsFile.write(JsonOutput.toJson(mappings), "UTF-8")
+ }
+}
+
+void generateRegistryMappings(File targetDir, Map>>>> registryReports) {
+ this.generateRegistryMappings("particle_type", targetDir, registryReports, false)
+
+ this.generateRegistryMappings("block_entity_type", targetDir, registryReports.findAll(entry -> MinecraftVersion.BLOCK_ENTITY_VERSIONS.contains(entry.getKey())), false)
+
+ def worldVersions = registryReports.findAll(entry -> MinecraftVersion.WORLD_VERSIONS.contains(entry.getKey()))
+ this.generateRegistryMappings("item", targetDir, worldVersions, true)
+ this.generateRegistryMappings("block", targetDir, worldVersions, true)
+
+ this.generateRegistryMappings("data_component_type", targetDir, registryReports.findAll(entry -> entry.getKey() >= MinecraftVersion.MINECRAFT_1_20_5), false)
+}
+
+static Map>> getTags(File tagDir, Map tagTypes) {
+ Map>> tags = new HashMap<>()
+ tagTypes.forEach((directoryName, key) -> {
+ File directory = new File(tagDir, directoryName)
+ if (!directory.exists()) {
+ return
+ }
+
+ Map> typeTags = new HashMap<>()
+ directory.eachFileRecurse(FileType.FILES, file -> {
+ String tag = directory.toPath().relativize(file.toPath()).toString()
+ typeTags["minecraft:" + tag.take(tag.lastIndexOf('.' as char as int)).replace(File.separatorChar, '/' as char)] = (List) SLURPER.parse(file, "UTF-8")["values"]
+ })
+
+ Map> tempTags = new HashMap<>()
+ boolean flatten = false
+ while (!flatten) {
+ flatten = true
+ typeTags.forEach((name, currentTags) -> {
+ List newTags = new ArrayList<>()
+ currentTags.forEach(currentTag -> {
+ if (currentTag.charAt(0) == '#' as char) {
+ newTags.addAll(typeTags[currentTag.substring(1)])
+ flatten = false
+ } else {
+ newTags.add(currentTag)
+ }
+ })
+
+ tempTags[name] = newTags
+ })
+
+ typeTags = tempTags
+ tempTags = new HashMap<>()
+ }
+
+ tags[key] = typeTags
+ })
+ return tags
+}
+
+void generateTags(File targetDir, Map tagDirs) {
+ File tagsFile = new File(targetDir, "tags.json")
+ if (checkIsCacheValid(tagsFile)) {
+ this.println("> Generating tags...")
+ Map> tagTypes = (Map>) SLURPER.parse(new File(this.getProjectDir(), "mappings/tag_types.json"), "UTF-8")
+ Map>> mergedTags = new TreeMap<>(Comparator.naturalOrder())
+ tagDirs.forEach((version, dir) -> {
+ getTags(dir, tagTypes["tag_types"]).forEach((type, typeTags) -> {
+ Map> mergedTypeTags = mergedTags.computeIfAbsent(type, _ -> new TreeMap<>(Comparator.naturalOrder()))
+ typeTags.forEach((name, values) -> {
+ Set mergedValues = mergedTypeTags.computeIfAbsent(name, _ -> new TreeSet<>(Comparator.naturalOrder()))
+ if (type in tagTypes["supported_tag_types"]) {
+ mergedValues.addAll(values)
+ }
+ })
+ })
+ })
+
+ tagsFile.write(JsonOutput.toJson(mergedTags), "UTF-8")
+ }
+}
+
+tasks.register("generateMappings") {
+ dependsOn(downloadManifest)
+
+ File targetDir = new File(this.project.ext.generatedDir, "mappings")
+ targetDir.mkdirs()
+
+ this.println("> Generating Minecraft data...")
+
+ Map generated = MinecraftVersion.values().findAll(version -> version >= MinecraftVersion.MINECRAFT_1_13).collectEntries(version -> [version, this.generateData(version)])
+ this.generateTags(targetDir, generated.collectEntries((version, directory) -> [version, new File(directory, "data/minecraft/tags")]))
+ this.generateBlockMappings(targetDir, generated.collectEntries((version, directory) -> [version, SLURPER.parse(new File(directory, "reports/blocks.json"), "UTF-8")]))
+
+ // 1.13.x doesn't produce registries.json
+ generated.remove(MinecraftVersion.MINECRAFT_1_13)
+ generated.remove(MinecraftVersion.MINECRAFT_1_13_1)
+ generated.remove(MinecraftVersion.MINECRAFT_1_13_2)
+ this.generateRegistryMappings(targetDir, generated.collectEntries((version, directory) -> [version, SLURPER.parse(new File(directory, "reports/registries.json"), "UTF-8")]))
+}
+
+processResources.dependsOn(generateMappings)
diff --git a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
index 2b0ac454..168a80a8 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
@@ -31,6 +31,7 @@
import com.velocitypowered.natives.compression.VelocityCompressor;
import com.velocitypowered.natives.util.Natives;
import com.velocitypowered.proxy.VelocityServer;
+import com.velocitypowered.proxy.config.VelocityConfiguration;
import com.velocitypowered.proxy.connection.MinecraftConnection;
import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
@@ -56,7 +57,6 @@
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import net.elytrium.commons.config.YamlConfig;
import net.elytrium.commons.kyori.serialization.Serializer;
@@ -99,12 +99,10 @@
import net.elytrium.limboapi.protocol.packets.PacketFactoryImpl;
import net.elytrium.limboapi.server.CachedPackets;
import net.elytrium.limboapi.server.LimboImpl;
-import net.elytrium.limboapi.server.item.SimpleItemComponentManager;
import net.elytrium.limboapi.server.item.SimpleItemComponentMap;
import net.elytrium.limboapi.server.world.SimpleBlock;
import net.elytrium.limboapi.server.world.SimpleBlockEntity;
import net.elytrium.limboapi.server.world.SimpleItem;
-import net.elytrium.limboapi.server.world.SimpleTagManager;
import net.elytrium.limboapi.server.world.SimpleWorld;
import net.elytrium.limboapi.server.world.chunk.SimpleChunk;
import net.elytrium.limboapi.utils.ReloadListener;
@@ -118,7 +116,7 @@
@Plugin(
id = "limboapi",
name = "LimboAPI",
- version = BuildConstants.LIMBO_VERSION,
+ version = "BuildConstants.LIMBO_VERSION", // TODO
description = "Velocity plugin for making virtual servers.",
url = "https://elytrium.net/",
authors = {
@@ -130,23 +128,26 @@ public class LimboAPI implements LimboFactory {
private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 768;
+ // TODO translate
+ /**
+ * UUID на backend сервере может отличаться от того что хранится на клиенте, эта карта используется для обмана клиента подставляя ему тот uuid который клиент ожидает
+ */
+ private static final Map CLIENT_UUIDS = new HashMap<>();
+
@MonotonicNonNull
private static Logger LOGGER;
@MonotonicNonNull
private static Serializer SERIALIZER;
- public static final ConcurrentHashMap INITIAL_ID = new ConcurrentHashMap<>();
-
private final VelocityServer server;
private final Metrics.Factory metricsFactory;
private final File configFile;
private final Set players;
private final CachedPackets packets;
private final PacketFactory packetFactory;
- private final SimpleItemComponentManager itemComponentManager = new SimpleItemComponentManager();
- private final HashMap loginQueue;
- private final HashMap> kickCallback;
- private final HashMap nextServer;
+ private final Map loginQueue;
+ private final Map> kickCallback;
+ private final Map nextServer;
private PreparedPacketFactory preparedPacketFactory;
private PreparedPacketFactory configPreparedPacketFactory;
@@ -184,19 +185,14 @@ public LimboAPI(Logger logger, ProxyServer server, Metrics.Factory metricsFactor
}
LOGGER.info("Initializing Simple Virtual World system...");
- SimpleBlock.init();
- SimpleBlockEntity.init();
- SimpleItem.init();
- SimpleTagManager.init();
LOGGER.info("Hooking into PlayerList/UpsertPlayerInfo and StateRegistry...");
try {
- LegacyPlayerListItemHook.init(this, LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
- UpsertPlayerInfoHook.init(this, LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
- RemovePlayerInfoHook.init(this, LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
-
+ LegacyPlayerListItemHook.init(LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
+ UpsertPlayerInfoHook.init(LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
+ RemovePlayerInfoHook.init(LimboProtocol.PLAY_CLIENTBOUND_REGISTRY);
LimboProtocol.init();
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
}
@@ -207,7 +203,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
if (Settings.IMP.reload(this.configFile, Settings.IMP.PREFIX) == YamlConfig.LoadResult.CONFIG_NOT_EXISTS) {
LOGGER.warn("************* FIRST LAUNCH *************");
LOGGER.warn("Thanks for installing LimboAPI!");
- LOGGER.warn("(C) 2021 - 2024 Elytrium");
+ LOGGER.warn("(C) 2021-2024 Elytrium");
LOGGER.warn("");
LOGGER.warn("Check out our plugins here: https://ely.su/github <3");
LOGGER.warn("Discord: https://ely.su/discord");
@@ -262,17 +258,21 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
this.metricsFactory.make(this, 12530);
if (Settings.IMP.MAIN.CHECK_FOR_UPDATES) {
- if (!UpdatesChecker.checkVersionByURL("https://raw.githubusercontent.com/Elytrium/LimboAPI/master/VERSION", Settings.IMP.VERSION)) {
- LOGGER.error("****************************************");
- LOGGER.warn("The new LimboAPI update was found, please update.");
- LOGGER.error("https://github.com/Elytrium/LimboAPI/releases/");
- LOGGER.error("****************************************");
+ try {
+ if (!UpdatesChecker.checkVersionByURL("https://raw.githubusercontent.com/Elytrium/LimboAPI/master/VERSION", Settings.IMP.VERSION)) {
+ LOGGER.error("****************************************");
+ LOGGER.warn("The new LimboAPI update was found, please update.");
+ LOGGER.error("https://github.com/Elytrium/LimboAPI/releases/");
+ LOGGER.error("****************************************");
+ }
+ } catch (Exception e) {
+ LimboAPI.LOGGER.warn("Failed to check for updates:", e);
}
}
}
@Subscribe(order = PostOrder.LAST)
- public void postProxyInitialization(ProxyInitializeEvent event) throws IllegalAccessException {
+ public void onPostProxyInitialize(ProxyInitializeEvent event) throws Throwable {
this.eventManagerHook.reloadHandlers();
}
@@ -303,19 +303,12 @@ public void reload() {
}
private void reloadVersion() {
- if (Settings.IMP.MAIN.PREPARE_MAX_VERSION.equals("LATEST")) {
- this.maxVersion = ProtocolVersion.MAXIMUM_VERSION;
- } else {
- this.maxVersion = ProtocolVersion.valueOf("MINECRAFT_" + Settings.IMP.MAIN.PREPARE_MAX_VERSION);
- }
-
+ this.maxVersion = Settings.IMP.MAIN.PREPARE_MAX_VERSION.equals("LATEST") ? ProtocolVersion.MAXIMUM_VERSION : ProtocolVersion.valueOf("MINECRAFT_" + Settings.IMP.MAIN.PREPARE_MAX_VERSION);
this.minVersion = ProtocolVersion.valueOf("MINECRAFT_" + Settings.IMP.MAIN.PREPARE_MIN_VERSION);
-
- if (ProtocolVersion.MAXIMUM_VERSION.compareTo(this.maxVersion) > 0 || ProtocolVersion.MINIMUM_VERSION.compareTo(this.minVersion) < 0) {
+ if (ProtocolVersion.MAXIMUM_VERSION.greaterThan(this.maxVersion) || ProtocolVersion.MINIMUM_VERSION.lessThan(this.minVersion)) {
LOGGER.warn(
- "Currently working only with "
- + this.minVersion.getVersionIntroducedIn() + " - " + this.maxVersion.getMostRecentSupportedVersion()
- + " versions, modify the plugins/limboapi/config.yml file if you want the plugin to work with other versions."
+ "Currently working only with {} - {} versions, modify the plugins/limboapi/config.yml file if you want the plugin to work with other versions.",
+ this.minVersion.getVersionIntroducedIn(), this.maxVersion.getMostRecentSupportedVersion()
);
}
}
@@ -324,52 +317,44 @@ public void reloadPreparedPacketFactory() {
int level = this.server.getConfiguration().getCompressionLevel();
int threshold = this.server.getConfiguration().getCompressionThreshold();
this.compressionEnabled = threshold != -1;
-
- this.preparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold,
- Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
- this.configPreparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold,
- Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
- this.loginPreparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold,
- Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
+ this.preparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold, Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
+ this.configPreparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold, Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
+ this.loginPreparedPacketFactory.updateCompressor(this.compressionEnabled, level, threshold, Settings.IMP.MAIN.SAVE_UNCOMPRESSED_PACKETS, Settings.IMP.MAIN.COMPATIBILITY_MODE);
}
@Override
public VirtualBlock createSimpleBlock(Block block) {
- return SimpleBlock.fromLegacyID((short) block.getID());
+ return SimpleBlock.fromLegacyId((short) block.getId());
}
@Override
- public VirtualBlock createSimpleBlock(short legacyID) {
- return SimpleBlock.fromLegacyID(legacyID);
+ public VirtualBlock createSimpleBlock(short legacyId) {
+ return SimpleBlock.fromLegacyId(legacyId);
}
@Override
- public VirtualBlock createSimpleBlock(String modernID) {
- return SimpleBlock.fromModernID(modernID);
+ public VirtualBlock createSimpleBlock(String modernId) {
+ return SimpleBlock.fromModernId(modernId);
}
@Override
- public VirtualBlock createSimpleBlock(String modernID, Map properties) {
- return SimpleBlock.fromModernID(modernID, properties);
+ public VirtualBlock createSimpleBlock(String modernId, Map properties) {
+ return SimpleBlock.fromModernId(modernId, properties);
}
@Override
public VirtualBlock createSimpleBlock(short id, boolean modern) {
- if (modern) {
- return SimpleBlock.solid(id);
- } else {
- return SimpleBlock.fromLegacyID(id);
- }
+ return modern ? SimpleBlock.solid(id) : SimpleBlock.fromLegacyId(id);
}
@Override
- public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, short id) {
- return new SimpleBlock(solid, air, motionBlocking, id);
+ public VirtualBlock createSimpleBlock(short blockStateId, boolean air, boolean solid, boolean motionBlocking) {
+ return new SimpleBlock(blockStateId, air, solid, motionBlocking);
}
@Override
- public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, String modernID, Map properties) {
- return new SimpleBlock(solid, air, motionBlocking, modernID, properties);
+ public VirtualBlock createSimpleBlock(String modernId, Map properties, boolean air, boolean solid, boolean motionBlocking) {
+ return new SimpleBlock(modernId, properties, air, solid, motionBlocking);
}
@Override
@@ -432,8 +417,7 @@ public ByteBuf encodeSingleLoginUncompressed(MinecraftPacket packet, ProtocolVer
public void inject3rdParty(Player player, MinecraftConnection connection, ChannelPipeline pipeline) {
StateRegistry state = connection.getState();
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0
- || (state != StateRegistry.CONFIG && state != StateRegistry.LOGIN)) {
+ if (connection.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2) || (state != StateRegistry.CONFIG && state != StateRegistry.LOGIN)) {
this.preparedPacketFactory.inject(player, connection, pipeline);
} else {
this.configPreparedPacketFactory.inject(player, connection, pipeline);
@@ -445,32 +429,28 @@ public void setState(MinecraftConnection connection, StateRegistry stateRegistry
this.setEncoderState(connection, stateRegistry);
}
- public void setActiveSessionHandler(MinecraftConnection connection, StateRegistry stateRegistry,
- MinecraftSessionHandler sessionHandler) {
+ public void setActiveSessionHandler(MinecraftConnection connection, StateRegistry stateRegistry, MinecraftSessionHandler sessionHandler) {
connection.setActiveSessionHandler(stateRegistry, sessionHandler);
this.setEncoderState(connection, stateRegistry);
}
public void setEncoderState(MinecraftConnection connection, StateRegistry state) {
// As CONFIG state was added in 1.20.2, no need to track it for lower versions
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0) {
+ if (connection.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
return;
}
+ var pipeline = connection.getChannel().pipeline();
if (Settings.IMP.MAIN.COMPATIBILITY_MODE) {
- MinecraftEncoder encoder = connection.getChannel().pipeline().get(MinecraftEncoder.class);
+ MinecraftEncoder encoder = pipeline.get(MinecraftEncoder.class);
if (encoder != null) {
encoder.setState(state);
}
}
- PreparedPacketEncoder encoder = connection.getChannel().pipeline().get(PreparedPacketEncoder.class);
+ PreparedPacketEncoder encoder = pipeline.get(PreparedPacketEncoder.class);
if (encoder != null) {
- if (state != StateRegistry.CONFIG && state != StateRegistry.LOGIN) {
- encoder.setFactory(this.preparedPacketFactory);
- } else {
- encoder.setFactory(this.configPreparedPacketFactory);
- }
+ encoder.setFactory(state == StateRegistry.CONFIG || state == StateRegistry.LOGIN ? this.configPreparedPacketFactory : this.preparedPacketFactory);
}
}
@@ -479,17 +459,9 @@ public void deject3rdParty(ChannelPipeline pipeline) {
}
public void fixDecompressor(ChannelPipeline pipeline, int threshold, boolean onLogin) {
- ChannelHandler decoder;
- if (onLogin && Settings.IMP.MAIN.DISCARD_COMPRESSION_ON_LOGIN) {
- decoder = new MinecraftDiscardCompressDecoder();
- } else if (!onLogin && Settings.IMP.MAIN.DISCARD_COMPRESSION_AFTER_LOGIN) {
- decoder = new MinecraftDiscardCompressDecoder();
- } else {
- int level = this.server.getConfiguration().getCompressionLevel();
- VelocityCompressor compressor = Natives.compress.get().create(level);
- decoder = new MinecraftLimitedCompressDecoder(threshold, compressor);
- }
-
+ ChannelHandler decoder = onLogin && Settings.IMP.MAIN.DISCARD_COMPRESSION_ON_LOGIN || !onLogin && Settings.IMP.MAIN.DISCARD_COMPRESSION_AFTER_LOGIN
+ ? new MinecraftDiscardCompressDecoder()
+ : new MinecraftLimitedCompressDecoder(threshold, Natives.compress.get().create(this.server.getConfiguration().getCompressionLevel()));
if (Settings.IMP.MAIN.COMPATIBILITY_MODE && pipeline.context(Connections.COMPRESSION_DECODER) != null) {
pipeline.replace(Connections.COMPRESSION_DECODER, Connections.COMPRESSION_DECODER, decoder);
} else {
@@ -504,9 +476,9 @@ public void fixCompressor(ChannelPipeline pipeline, ProtocolVersion version) {
pipeline.addBefore(Connections.MINECRAFT_DECODER, Connections.FRAME_ENCODER, MinecraftVarintLengthEncoder.INSTANCE);
}
} else {
- int level = this.server.getConfiguration().getCompressionLevel();
- int compressionThreshold = this.server.getConfiguration().getCompressionThreshold();
- VelocityCompressor compressor = Natives.compress.get().create(level);
+ VelocityConfiguration configuration = this.server.getConfiguration();
+ int compressionThreshold = configuration.getCompressionThreshold();
+ VelocityCompressor compressor = Natives.compress.get().create(configuration.getCompressionLevel());
if (!Settings.IMP.MAIN.COMPATIBILITY_MODE) {
MinecraftCompressorAndLengthEncoder encoder = new MinecraftCompressorAndLengthEncoder(compressionThreshold, compressor);
pipeline.remove(compressionHandler);
@@ -535,23 +507,28 @@ public VirtualItem getItem(Item item) {
}
@Override
- public VirtualItem getItem(String itemID) {
- return SimpleItem.fromModernID(itemID);
+ public VirtualItem getItem(String modernId) {
+ return SimpleItem.fromModernId(modernId);
}
@Override
- public VirtualItem getLegacyItem(int itemLegacyID) {
- return SimpleItem.fromLegacyID(itemLegacyID);
+ public VirtualItem getLegacyItem(int legacyId) {
+ return SimpleItem.fromLegacyId(legacyId);
}
@Override
public ItemComponentMap createItemComponentMap() {
- return new SimpleItemComponentMap(this.itemComponentManager);
+ return new SimpleItemComponentMap();
+ }
+
+ @Override
+ public VirtualBlockEntity getBlockEntityFromModernId(String modernId) {
+ return SimpleBlockEntity.fromModernId(modernId);
}
@Override
- public VirtualBlockEntity getBlockEntity(String entityID) {
- return SimpleBlockEntity.fromModernID(entityID);
+ public VirtualBlockEntity getBlockEntityFromLegacyId(String legacyId) {
+ return SimpleBlockEntity.fromLegacyId(legacyId);
}
@Override
@@ -627,18 +604,6 @@ public RegisteredServer getNextServer(Player player) {
return this.nextServer.get(player);
}
- public void setInitialID(Player player, UUID nextServer) {
- INITIAL_ID.put(player, nextServer);
- }
-
- public void removeInitialID(Player player) {
- INITIAL_ID.remove(player);
- }
-
- public UUID getInitialID(Player player) {
- return INITIAL_ID.get(player);
- }
-
public LoginListener getLoginListener() {
return this.loginListener;
}
@@ -678,6 +643,28 @@ public WorldFile openWorldFile(BuiltInWorldFileType apiType, CompoundBinaryTag t
return WorldFileTypeRegistry.fromApiType(apiType, tag);
}
+ public static void setClientUniqueId(Player player, UUID clientUniqueId) {
+ LimboAPI.CLIENT_UUIDS.put(player, clientUniqueId);
+ }
+
+ public static void removeClientUniqueId(Player player) {
+ LimboAPI.CLIENT_UUIDS.remove(player);
+ }
+
+ public static UUID getClientUniqueId(Player player) {
+ return LimboAPI.CLIENT_UUIDS.get(player);
+ }
+
+ public static UUID getClientUniqueId(UUID serverSideUniqueId) {
+ for (var entry : LimboAPI.CLIENT_UUIDS.entrySet()) {
+ if (entry.getKey().getUniqueId().equals(serverSideUniqueId)) {
+ return entry.getValue();
+ }
+ }
+
+ return serverSideUniqueId;
+ }
+
private static void setLogger(Logger logger) {
LOGGER = logger;
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/Settings.java b/plugin/src/main/java/net/elytrium/limboapi/Settings.java
index d73497b3..0f8b2c74 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/Settings.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/Settings.java
@@ -27,7 +27,7 @@ public class Settings extends YamlConfig {
public static final Settings IMP = new Settings();
@Final
- public String VERSION = BuildConstants.LIMBO_VERSION;
+ public String VERSION = "BuildConstants.LIMBO_VERSION"; // TODO
@Comment({
"Available serializers:",
diff --git a/plugin/src/main/java/net/elytrium/limboapi/file/MCEditSchematicFile.java b/plugin/src/main/java/net/elytrium/limboapi/file/MCEditSchematicFile.java
index 8f33215f..0e441399 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/file/MCEditSchematicFile.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/file/MCEditSchematicFile.java
@@ -20,6 +20,8 @@
import net.elytrium.limboapi.api.LimboFactory;
import net.elytrium.limboapi.api.chunk.VirtualWorld;
import net.elytrium.limboapi.api.file.WorldFile;
+import net.kyori.adventure.nbt.BinaryTag;
+import net.kyori.adventure.nbt.ByteArrayBinaryTag;
import net.kyori.adventure.nbt.CompoundBinaryTag;
public class MCEditSchematicFile implements WorldFile {
@@ -28,31 +30,27 @@ public class MCEditSchematicFile implements WorldFile {
private final short height;
private final short length;
private final byte[] blocks;
- private byte[] addBlocks = new byte[0];
+ private final byte[] addBlocks;
public MCEditSchematicFile(CompoundBinaryTag tag) {
this.width = tag.getShort("Width");
this.height = tag.getShort("Height");
this.length = tag.getShort("Length");
this.blocks = tag.getByteArray("Blocks");
-
- if (tag.keySet().contains("AddBlocks")) {
- this.addBlocks = tag.getByteArray("AddBlocks");
- }
+ BinaryTag addBlocks = tag.get("AddBlocks");
+ this.addBlocks = addBlocks == null ? new byte[0] : ((ByteArrayBinaryTag) addBlocks).value();
}
@Override
public void toWorld(LimboFactory factory, VirtualWorld world, int offsetX, int offsetY, int offsetZ, int lightLevel) {
- short[] blockIDs = new short[this.blocks.length];
- for (int index = 0; index < blockIDs.length; ++index) {
+ short[] blockIds = new short[this.blocks.length];
+ for (int index = 0; index < blockIds.length; ++index) {
if ((index >> 1) >= this.addBlocks.length) {
- blockIDs[index] = (short) (this.blocks[index] & 0xFF);
+ blockIds[index] = (short) (this.blocks[index] & 0xFF);
+ } else if ((index & 1) == 0) {
+ blockIds[index] = (short) (((this.addBlocks[index >> 1] & 0x0F) << 8) + (this.addBlocks[index] & 0xFF));
} else {
- if ((index & 1) == 0) {
- blockIDs[index] = (short) (((this.addBlocks[index >> 1] & 0x0F) << 8) + (this.addBlocks[index] & 0xFF));
- } else {
- blockIDs[index] = (short) (((this.addBlocks[index >> 1] & 0xF0) << 4) + (this.addBlocks[index] & 0xFF));
- }
+ blockIds[index] = (short) (((this.addBlocks[index >> 1] & 0xF0) << 4) + (this.addBlocks[index] & 0xFF));
}
}
@@ -60,7 +58,7 @@ public void toWorld(LimboFactory factory, VirtualWorld world, int offsetX, int o
for (int posY = 0; posY < this.height; ++posY) {
for (int posZ = 0; posZ < this.length; ++posZ) {
int index = (posY * this.length + posZ) * this.width + posX;
- world.setBlock(posX + offsetX, posY + offsetY, posZ + offsetZ, factory.createSimpleBlock(blockIDs[index]));
+ world.setBlock(posX + offsetX, posY + offsetY, posZ + offsetZ, factory.createSimpleBlock(blockIds[index]));
}
}
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/file/StructureNbtFile.java b/plugin/src/main/java/net/elytrium/limboapi/file/StructureNbtFile.java
index 54d9f3f4..20586587 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/file/StructureNbtFile.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/file/StructureNbtFile.java
@@ -26,6 +26,7 @@
import net.kyori.adventure.nbt.BinaryTag;
import net.kyori.adventure.nbt.CompoundBinaryTag;
import net.kyori.adventure.nbt.ListBinaryTag;
+import net.kyori.adventure.nbt.StringBinaryTag;
public class StructureNbtFile implements WorldFile {
@@ -42,31 +43,28 @@ public void toWorld(LimboFactory factory, VirtualWorld world, int offsetX, int o
VirtualBlock[] palettedBlocks = new VirtualBlock[this.palette.size()];
for (int i = 0; i < this.palette.size(); ++i) {
CompoundBinaryTag map = this.palette.getCompound(i);
-
- Map propertiesMap = null;
- if (map.keySet().contains("Properties")) {
- propertiesMap = new HashMap<>();
- CompoundBinaryTag properties = map.getCompound("Properties");
- for (String entry : properties.keySet()) {
- propertiesMap.put(entry, properties.getString(entry));
- }
+ BinaryTag properties = map.get("Properties");
+ if (properties == null) {
+ palettedBlocks[i] = factory.createSimpleBlock(map.getString("Name"), null);
+ } else {
+ Map propertiesMap = new HashMap<>();
+ ((CompoundBinaryTag) properties).forEach(entry -> propertiesMap.put(entry.getKey(), ((StringBinaryTag) entry.getValue()).value()));
+ palettedBlocks[i] = factory.createSimpleBlock(map.getString("Name"), propertiesMap);
}
-
- palettedBlocks[i] = factory.createSimpleBlock(map.getString("Name"), propertiesMap);
}
for (BinaryTag binaryTag : this.blocks) {
CompoundBinaryTag blockMap = (CompoundBinaryTag) binaryTag;
- ListBinaryTag posTag = blockMap.getList("pos");
+ ListBinaryTag pos = blockMap.getList("pos");
VirtualBlock block = palettedBlocks[blockMap.getInt("state")];
- int x = offsetX + posTag.getInt(0);
- int y = offsetY + posTag.getInt(1);
- int z = offsetZ + posTag.getInt(2);
- world.setBlock(x, y, z, block);
+ int posX = offsetX + pos.getInt(0);
+ int posY = offsetY + pos.getInt(1);
+ int posZ = offsetZ + pos.getInt(2);
+ world.setBlock(posX, posY, posZ, block);
CompoundBinaryTag blockEntityNbt = blockMap.getCompound("nbt");
if (!blockEntityNbt.keySet().isEmpty()) {
- world.setBlockEntity(x, y, z, blockEntityNbt, factory.getBlockEntity(block.getModernStringID()));
+ world.setBlockEntity(posX, posY, posZ, blockEntityNbt, factory.getBlockEntityFromModernId(block.modernId()));
}
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/file/WorldEditSchemFile.java b/plugin/src/main/java/net/elytrium/limboapi/file/WorldEditSchemFile.java
index b5fed011..2c0587fe 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/file/WorldEditSchemFile.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/file/WorldEditSchemFile.java
@@ -46,10 +46,10 @@ public WorldEditSchemFile(CompoundBinaryTag tag) {
ByteBuf blockDataBuf = Unpooled.wrappedBuffer(tag.getByteArray("BlockData"));
this.blocks = new int[this.width * this.height * this.length];
-
- for (int i = 0; i < this.blocks.length; i++) {
+ for (int i = 0; i < this.blocks.length; ++i) {
this.blocks[i] = ProtocolUtils.readVarInt(blockDataBuf);
}
+ blockDataBuf.release();
this.blockEntities = tag.getList("BlockEntities");
}
@@ -57,13 +57,12 @@ public WorldEditSchemFile(CompoundBinaryTag tag) {
@Override
public void toWorld(LimboFactory factory, VirtualWorld world, int offsetX, int offsetY, int offsetZ, int lightLevel) {
VirtualBlock[] palettedBlocks = new VirtualBlock[this.palette.keySet().size()];
- this.palette.forEach((entry) -> palettedBlocks[((IntBinaryTag) entry.getValue()).value()] = factory.createSimpleBlock(entry.getKey()));
+ this.palette.forEach(entry -> palettedBlocks[((IntBinaryTag) entry.getValue()).value()] = factory.createSimpleBlock(entry.getKey()));
for (int posX = 0; posX < this.width; ++posX) {
for (int posY = 0; posY < this.height; ++posY) {
for (int posZ = 0; posZ < this.length; ++posZ) {
- int index = (posY * this.length + posZ) * this.width + posX;
- world.setBlock(posX + offsetX, posY + offsetY, posZ + offsetZ, palettedBlocks[this.blocks[index]]);
+ world.setBlock(offsetX + posX, offsetY + posY, offsetZ + posZ, palettedBlocks[this.blocks[(posY * this.length + posZ) * this.width + posX]]);
}
}
}
@@ -71,12 +70,7 @@ public void toWorld(LimboFactory factory, VirtualWorld world, int offsetX, int o
for (BinaryTag blockEntity : this.blockEntities) {
CompoundBinaryTag blockEntityData = (CompoundBinaryTag) blockEntity;
int[] posTag = blockEntityData.getIntArray("Pos");
- world.setBlockEntity(
- offsetX + posTag[0],
- offsetY + posTag[1],
- offsetZ + posTag[2],
- blockEntityData,
- factory.getBlockEntity(blockEntityData.getString("Id")));
+ world.setBlockEntity(offsetX + posTag[0], offsetY + posTag[1], offsetZ + posTag[2], blockEntityData, factory.getBlockEntityFromModernId(blockEntityData.getString("Id")));
}
world.fillSkyLight(lightLevel);
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/disconnect/DisconnectListener.java b/plugin/src/main/java/net/elytrium/limboapi/injection/disconnect/DisconnectListener.java
index 2d0deb4b..002b917f 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/disconnect/DisconnectListener.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/disconnect/DisconnectListener.java
@@ -37,6 +37,6 @@ public void onDisconnect(DisconnectEvent event) {
this.plugin.removeLoginQueue(player);
this.plugin.removeKickCallback(player);
this.plugin.removeNextServer(player);
- this.plugin.removeInitialID(player);
+ this.plugin.removeClientUniqueId(player);
}
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/ClosedMinecraftConnection.java b/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/ClosedMinecraftConnection.java
index cd7218a9..35580600 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/ClosedMinecraftConnection.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/ClosedMinecraftConnection.java
@@ -17,14 +17,14 @@
package net.elytrium.limboapi.injection.dummy;
-import com.velocitypowered.proxy.VelocityServer;
import com.velocitypowered.proxy.connection.MinecraftConnection;
-import io.netty.channel.Channel;
public class ClosedMinecraftConnection extends MinecraftConnection {
- public ClosedMinecraftConnection(Channel channel, VelocityServer server) {
- super(channel, server);
+ public static final MinecraftConnection INSTANCE = new ClosedMinecraftConnection();
+
+ private ClosedMinecraftConnection() {
+ super(new ClosedChannel(new DummyEventLoop()), null);
}
@Override
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventPool.java b/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventLoop.java
similarity index 98%
rename from plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventPool.java
rename to plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventLoop.java
index d622fcae..0b95b387 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventPool.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/dummy/DummyEventLoop.java
@@ -37,7 +37,7 @@
@SuppressWarnings("ConstantConditions")
@SuppressFBWarnings(value = "NP_NONNULL_RETURN_VIOLATION", justification = "This is dummy class.")
-public class DummyEventPool implements EventLoop {
+public class DummyEventLoop implements EventLoop {
@Override
public EventLoopGroup parent() {
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java b/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java
index 79136253..0e108055 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java
@@ -27,13 +27,9 @@
import com.velocitypowered.api.util.GameProfile;
import com.velocitypowered.proxy.event.VelocityEventManager;
import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -42,15 +38,17 @@
import net.elytrium.commons.utils.reflection.ReflectionException;
import net.elytrium.limboapi.LimboAPI;
import net.elytrium.limboapi.Settings;
+import net.elytrium.limboapi.utils.Reflection;
@SuppressWarnings("unchecked")
public class EventManagerHook {
- private static final Field HANDLERS_BY_TYPE_FIELD;
- private static final Class HANDLER_REGISTRATION_CLASS;
- private static final MethodHandle PLUGIN_FIELD;
- private static final MethodHandle FIRE_METHOD;
- private static final MethodHandle FUTURE_FIELD;
+ private static final MethodHandle FIRE_METHOD = Reflection.findVirtualVoid(
+ VelocityEventManager.class,
+ "fire",
+ CompletableFuture.class, Object.class, int.class, boolean.class, Reflection.findClass("com.velocitypowered.proxy.event.VelocityEventManager$HandlerRegistration").arrayType()
+ );
+ private static final MethodHandle FUTURE_FIELD = Reflection.findGetter(Reflection.findClass("com.velocitypowered.proxy.event.VelocityEventManager$ContinuationTask"), "future", CompletableFuture.class);
private final Set proceededProfiles = new HashSet<>();
private final LimboAPI plugin;
@@ -66,8 +64,7 @@ public EventManagerHook(LimboAPI plugin, VelocityEventManager eventManager) {
@Subscribe(order = PostOrder.FIRST)
public EventTask onGameProfileRequest(GameProfileRequestEvent event) {
- GameProfile originalProfile = event.getGameProfile();
- if (this.proceededProfiles.remove(originalProfile)) {
+ if (this.proceededProfiles.remove(event.getGameProfile())) {
return null;
} else {
CompletableFuture fireFuture = new CompletableFuture<>();
@@ -76,17 +73,17 @@ public EventTask onGameProfileRequest(GameProfileRequestEvent event) {
try {
this.plugin.getLoginListener().hookLoginSession(modifiedEvent);
hookFuture.complete(modifiedEvent);
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
});
if (this.hasHandlerRegistration) {
try {
- FIRE_METHOD.invoke(this.eventManager, fireFuture, event, 0, false, this.handlerRegistrations);
- } catch (Throwable e) {
+ EventManagerHook.FIRE_METHOD.invoke(this.eventManager, fireFuture, event, 0, false/*currentlyAsync, passing false to run continuation tasks in asyncExecutor*/, this.handlerRegistrations);
+ } catch (Throwable t) {
fireFuture.complete(event);
- throw new ReflectionException(e);
+ throw new ReflectionException(t);
}
} else {
fireFuture.complete(event);
@@ -99,8 +96,8 @@ public EventTask onGameProfileRequest(GameProfileRequestEvent event) {
if (future != null) {
future.complete(result);
}
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
}));
}
@@ -129,9 +126,12 @@ public void proceedProfile(GameProfile profile) {
}
@SuppressWarnings("rawtypes")
- public void reloadHandlers() throws IllegalAccessException {
- ListMultimap, ?> handlersMap = (ListMultimap, ?>) HANDLERS_BY_TYPE_FIELD.get(this.eventManager);
- List disabledHandlers = handlersMap.get(GameProfileRequestEvent.class);
+ public void reloadHandlers() throws Throwable {
+ Field handlersByTypeField = VelocityEventManager.class.getDeclaredField("handlersByType");
+ handlersByTypeField.setAccessible(true);
+ ListMultimap, ?> handlersByType = (ListMultimap, ?>) handlersByTypeField.get(this.eventManager);
+
+ List disabledHandlers = handlersByType.get(GameProfileRequestEvent.class);
List preEvents = new ArrayList<>();
List newHandlers = new ArrayList<>(disabledHandlers);
@@ -141,22 +141,20 @@ public void reloadHandlers() throws IllegalAccessException {
}
}
- try {
- for (Object handler : disabledHandlers) {
- PluginContainer pluginContainer = (PluginContainer) PLUGIN_FIELD.invoke(handler);
- String id = pluginContainer.getDescription().getId();
- if (Settings.IMP.MAIN.PRE_LIMBO_PROFILE_REQUEST_PLUGINS.contains(id)) {
- LimboAPI.getLogger().info("Hooking all GameProfileRequestEvent events from {} ", id);
- preEvents.add(handler);
- newHandlers.remove(handler);
- }
+ Class HandlerRegistration = Reflection.findClass("com.velocitypowered.proxy.event.VelocityEventManager$HandlerRegistration");
+ Field pluginField = HandlerRegistration.getDeclaredField("plugin");
+ pluginField.setAccessible(true);
+ for (Object handler : disabledHandlers) {
+ String id = ((PluginContainer) pluginField.get(handler)).getDescription().getId();
+ if (Settings.IMP.MAIN.PRE_LIMBO_PROFILE_REQUEST_PLUGINS.contains(id)) {
+ LimboAPI.getLogger().info("Hooking all GameProfileRequestEvent events from {}", id);
+ preEvents.add(handler);
+ newHandlers.remove(handler);
}
- } catch (Throwable e) {
- throw new ReflectionException(e);
}
- handlersMap.replaceValues(GameProfileRequestEvent.class, newHandlers);
- this.handlerRegistrations = Array.newInstance(HANDLER_REGISTRATION_CLASS, preEvents.size());
+ handlersByType.replaceValues(GameProfileRequestEvent.class, newHandlers);
+ this.handlerRegistrations = Array.newInstance(HandlerRegistration, preEvents.size());
for (int i = 0; i < preEvents.size(); ++i) {
Array.set(this.handlerRegistrations, i, preEvents.get(i));
@@ -164,38 +162,4 @@ public void reloadHandlers() throws IllegalAccessException {
this.hasHandlerRegistration = !preEvents.isEmpty();
}
-
- static {
- try {
- HANDLERS_BY_TYPE_FIELD = VelocityEventManager.class.getDeclaredField("handlersByType");
- HANDLERS_BY_TYPE_FIELD.setAccessible(true);
-
- HANDLER_REGISTRATION_CLASS = Class.forName("com.velocitypowered.proxy.event.VelocityEventManager$HandlerRegistration");
- PLUGIN_FIELD = MethodHandles.privateLookupIn(HANDLER_REGISTRATION_CLASS, MethodHandles.lookup())
- .findGetter(HANDLER_REGISTRATION_CLASS, "plugin", PluginContainer.class);
-
- Class continuationTaskClass = Class.forName("com.velocitypowered.proxy.event.VelocityEventManager$ContinuationTask");
- FUTURE_FIELD = MethodHandles.privateLookupIn(continuationTaskClass, MethodHandles.lookup())
- .findGetter(continuationTaskClass, "future", CompletableFuture.class);
-
- // The desired 5-argument fire method is private, and its 5th argument is the array of the private class,
- // so we can't pass it into the Class#getDeclaredMethod(Class...) method.
- Method fireMethod = Arrays.stream(VelocityEventManager.class.getDeclaredMethods())
- .filter(method -> method.getName().equals("fire") && method.getParameterCount() == 5)
- .findFirst()
- .orElseThrow();
- fireMethod.setAccessible(true);
- FIRE_METHOD = MethodHandles.privateLookupIn(VelocityEventManager.class, MethodHandles.lookup())
- .findVirtual(VelocityEventManager.class, "fire", MethodType.methodType(
- void.class,
- CompletableFuture.class,
- Object.class,
- int.class,
- boolean.class,
- Array.newInstance(HANDLER_REGISTRATION_CLASS, 0).getClass()
- ));
- } catch (NoSuchFieldException | ClassNotFoundException | IllegalAccessException | NoSuchMethodException e) {
- throw new ReflectionException(e);
- }
- }
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java
index 1e635a9a..b59743e4 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java
@@ -39,16 +39,12 @@
import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent;
import com.velocitypowered.api.event.player.ServerConnectedEvent;
import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.proxy.InboundConnection;
import com.velocitypowered.api.proxy.crypto.IdentifiedKey;
-import com.velocitypowered.api.proxy.player.TabList;
import com.velocitypowered.api.util.GameProfile;
import com.velocitypowered.api.util.UuidUtils;
-import com.velocitypowered.natives.compression.VelocityCompressor;
import com.velocitypowered.natives.util.Natives;
import com.velocitypowered.proxy.VelocityServer;
import com.velocitypowered.proxy.config.PlayerInfoForwarding;
-import com.velocitypowered.proxy.config.VelocityConfiguration;
import com.velocitypowered.proxy.connection.MinecraftConnection;
import com.velocitypowered.proxy.connection.client.AuthSessionHandler;
import com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler;
@@ -62,42 +58,38 @@
import com.velocitypowered.proxy.protocol.netty.MinecraftCompressorAndLengthEncoder;
import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccessPacket;
import com.velocitypowered.proxy.protocol.packet.SetCompressionPacket;
+import com.velocitypowered.proxy.tablist.InternalTabList;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPipeline;
import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.Field;
import java.net.InetSocketAddress;
import java.util.Objects;
import java.util.UUID;
-import java.util.function.BiConsumer;
import net.elytrium.commons.utils.reflection.ReflectionException;
import net.elytrium.limboapi.LimboAPI;
import net.elytrium.limboapi.Settings;
import net.elytrium.limboapi.api.event.LoginLimboRegisterEvent;
-import net.elytrium.limboapi.injection.dummy.ClosedChannel;
import net.elytrium.limboapi.injection.dummy.ClosedMinecraftConnection;
-import net.elytrium.limboapi.injection.dummy.DummyEventPool;
import net.elytrium.limboapi.injection.login.confirmation.LoginConfirmHandler;
import net.elytrium.limboapi.injection.packet.ServerLoginSuccessHook;
import net.elytrium.limboapi.injection.tablist.RewritingKeyedVelocityTabList;
import net.elytrium.limboapi.injection.tablist.RewritingVelocityTabList;
import net.elytrium.limboapi.injection.tablist.RewritingVelocityTabListLegacy;
-import net.elytrium.limboapi.utils.LambdaUtil;
+import net.elytrium.limboapi.utils.Reflection;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
public class LoginListener {
- private static final ClosedMinecraftConnection CLOSED_MINECRAFT_CONNECTION;
-
- private static final MethodHandle DELEGATE_FIELD;
- private static final BiConsumer MC_CONNECTION_SETTER;
- private static final MethodHandle CONNECTED_PLAYER_CONSTRUCTOR;
- private static final MethodHandle SPAWNED_FIELD;
- private static final BiConsumer TAB_LIST_SETTER;
+ private static final MethodHandle DELEGATE_FIELD = Reflection.findGetter(LoginInboundConnection.class, "delegate", InitialInboundConnection.class);
+ static final MethodHandle MC_CONNECTION_SETTER = Reflection.findSetter(AuthSessionHandler.class, "mcConnection", MinecraftConnection.class);
+ private static final MethodHandle CONNECTED_PLAYER_CONSTRUCTOR = Reflection.findConstructor(
+ ConnectedPlayer.class,
+ VelocityServer.class, GameProfile.class, MinecraftConnection.class, InetSocketAddress.class, String.class, boolean.class, IdentifiedKey.class
+ );
+ private static final MethodHandle TAB_LIST_SETTER = Reflection.findSetter(ConnectedPlayer.class, "tabList", InternalTabList.class);
+ private static final MethodHandle SPAWNED_FIELD = Reflection.findSetter(ClientPlaySessionHandler.class, "spawned", boolean.class);
private final LimboAPI plugin;
private final VelocityServer server;
@@ -119,7 +111,7 @@ public void hookInitialServer(PlayerChooseInitialServerEvent event) {
@SuppressWarnings("ConstantConditions")
public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
LoginInboundConnection inboundConnection = (LoginInboundConnection) event.getConnection();
- // In some cases, e.g. if the player logged out or was kicked right before the GameProfileRequestEvent hook,
+ // In some cases, e.g., if the player logged out or was kicked right before the GameProfileRequestEvent hook,
// the connection will be broken (possibly by GC) and we can't get it from the delegate field.
if (LoginInboundConnection.class.isAssignableFrom(inboundConnection.getClass())) {
// Changing mcConnection to the closed one. For what? To break the "initializePlayer"
@@ -132,23 +124,24 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
connection.eventLoop().execute(() -> {
try {
this.hookLoginSession(event);
- } catch (Throwable e) {
- throw new IllegalStateException("failed to handle login request", e);
+ } catch (Throwable t) {
+ throw new IllegalStateException("failed to handle login request", t);
}
});
return;
}
- Object handler = connection.getActiveSessionHandler();
- MC_CONNECTION_SETTER.accept(handler, CLOSED_MINECRAFT_CONNECTION);
+ AuthSessionHandler handler = (AuthSessionHandler) connection.getActiveSessionHandler();
+ MC_CONNECTION_SETTER.invokeExact(handler, ClosedMinecraftConnection.INSTANCE);
+ ProtocolVersion version = connection.getProtocolVersion();
LoginConfirmHandler loginHandler = null;
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0) {
- connection.setActiveSessionHandler(StateRegistry.LOGIN,
- loginHandler = new LoginConfirmHandler(this.plugin, connection));
+ boolean v1_20_2 = version.noLessThan(ProtocolVersion.MINECRAFT_1_20_2);
+ if (v1_20_2) {
+ connection.setActiveSessionHandler(StateRegistry.LOGIN, loginHandler = new LoginConfirmHandler(this.plugin, connection));
}
- // From Velocity.
+ // From Velocity
if (!connection.isClosed()) {
try {
IdentifiedKey playerKey = inboundConnection.getIdentifiedKey();
@@ -171,39 +164,37 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
event.getGameProfile(),
connection,
inboundConnection.getVirtualHost().orElse(null),
- ((InboundConnection) inboundConnection).getRawVirtualHost().orElse(null),
+ inboundConnection.getRawVirtualHost().orElse(null),
event.isOnlineMode(),
playerKey
);
- if (connection.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_19_3)) {
- TAB_LIST_SETTER.accept(player, new RewritingVelocityTabList(player));
- } else if (connection.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_8)) {
- TAB_LIST_SETTER.accept(player, new RewritingKeyedVelocityTabList(player, this.server));
- } else {
- TAB_LIST_SETTER.accept(player, new RewritingVelocityTabListLegacy(player, this.server));
- }
+ TAB_LIST_SETTER.invokeExact(player, (InternalTabList) (version.noLessThan(ProtocolVersion.MINECRAFT_1_19_3)
+ ? new RewritingVelocityTabList(player)
+ : version.noLessThan(ProtocolVersion.MINECRAFT_1_8)
+ ? new RewritingKeyedVelocityTabList(player, this.server)
+ : new RewritingVelocityTabListLegacy(player, this.server)
+ ));
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0) {
+ if (v1_20_2) {
loginHandler.setPlayer(player);
}
+
if (this.server.canRegisterConnection(player)) {
if (!connection.isClosed()) {
- // Complete the Login process.
- int threshold = this.server.getConfiguration().getCompressionThreshold();
+ // Complete the Login process
+ var configuration = this.server.getConfiguration();
+ int threshold = configuration.getCompressionThreshold();
ChannelPipeline pipeline = connection.getChannel().pipeline();
- boolean compressionEnabled = threshold >= 0 && connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0;
+ boolean compressionEnabled = threshold >= 0 && version.noLessThan(ProtocolVersion.MINECRAFT_1_8);
if (compressionEnabled) {
connection.write(new SetCompressionPacket(threshold));
this.plugin.fixDecompressor(pipeline, threshold, true);
- if (!Settings.IMP.MAIN.COMPATIBILITY_MODE) {
- pipeline.addFirst(Connections.COMPRESSION_ENCODER, new ChannelOutboundHandlerAdapter());
- } else {
- int level = this.server.getConfiguration().getCompressionLevel();
- VelocityCompressor compressor = Natives.compress.get().create(level);
- pipeline.addBefore(Connections.MINECRAFT_ENCODER, Connections.COMPRESSION_ENCODER,
- new MinecraftCompressorAndLengthEncoder(threshold, compressor));
+ if (Settings.IMP.MAIN.COMPATIBILITY_MODE) {
+ pipeline.addBefore(Connections.MINECRAFT_ENCODER, Connections.COMPRESSION_ENCODER, new MinecraftCompressorAndLengthEncoder(threshold, Natives.compress.get().create(configuration.getCompressionLevel())));
pipeline.remove(Connections.FRAME_ENCODER);
+ } else {
+ pipeline.addFirst(Connections.COMPRESSION_ENCODER, new ChannelOutboundHandlerAdapter());
}
}
@@ -218,16 +209,15 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
pipeline.fireUserEventTriggered(VelocityConnectionEvent.COMPRESSION_DISABLED);
}
- VelocityConfiguration configuration = this.server.getConfiguration();
- UUID playerUniqueID = player.getUniqueId();
+ UUID playerUniqueId = player.getUniqueId();
if (configuration.getPlayerInfoForwardingMode() == PlayerInfoForwarding.NONE) {
- playerUniqueID = UuidUtils.generateOfflinePlayerUuid(player.getUsername());
+ playerUniqueId = UuidUtils.generateOfflinePlayerUuid(player.getUsername());
}
ServerLoginSuccessPacket success = new ServerLoginSuccessPacket();
success.setUsername(player.getUsername());
success.setProperties(player.getGameProfileProperties());
- success.setUuid(playerUniqueID);
+ success.setUuid(playerUniqueId);
if (Settings.IMP.MAIN.COMPATIBILITY_MODE) {
connection.write(success);
@@ -235,25 +225,25 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
ServerLoginSuccessHook successHook = new ServerLoginSuccessHook();
successHook.setUsername(player.getUsername());
successHook.setProperties(player.getGameProfileProperties());
- successHook.setUuid(playerUniqueID);
+ successHook.setUuid(playerUniqueId);
connection.write(successHook);
ChannelHandler compressionHandler = pipeline.get(Connections.COMPRESSION_ENCODER);
- if (compressionHandler != null) {
- connection.write(this.plugin.encodeSingleLogin(success, connection.getProtocolVersion()));
- } else {
+ if (compressionHandler == null) {
ChannelHandler frameHandler = pipeline.get(Connections.FRAME_ENCODER);
if (frameHandler != null) {
pipeline.remove(frameHandler);
}
- connection.write(this.plugin.encodeSingleLoginUncompressed(success, connection.getProtocolVersion()));
+ connection.write(this.plugin.encodeSingleLoginUncompressed(success, version));
+ } else {
+ connection.write(this.plugin.encodeSingleLogin(success, version));
}
}
- this.plugin.setInitialID(player, playerUniqueID);
+ LimboAPI.setClientUniqueId(player, playerUniqueId);
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0) {
+ if (v1_20_2) {
loginHandler.thenRun(() -> this.fireRegisterEvent(player, connection, inbound, handler));
} else {
connection.setState(StateRegistry.PLAY);
@@ -263,15 +253,14 @@ public void hookLoginSession(GameProfileRequestEvent event) throws Throwable {
} else {
player.disconnect0(Component.translatable("velocity.error.already-connected-proxy", NamedTextColor.RED), true);
}
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
}
}
}
- private void fireRegisterEvent(ConnectedPlayer player, MinecraftConnection connection,
- InitialInboundConnection inbound, Object handler) {
+ private void fireRegisterEvent(ConnectedPlayer player, MinecraftConnection connection, InitialInboundConnection inbound, AuthSessionHandler handler) {
this.server.getEventManager().fire(new LoginLimboRegisterEvent(player)).thenAcceptAsync(limboRegisterEvent -> {
LoginTasksQueue queue = new LoginTasksQueue(this.plugin, handler, this.server, player, inbound, limboRegisterEvent.getOnJoinCallbacks());
this.plugin.addLoginQueue(player, queue);
@@ -289,7 +278,7 @@ public void hookPlaySession(ServerConnectedEvent event) {
MinecraftConnection connection = player.getConnection();
// 1.20.2+ can ignore this, as it should be despawned by default
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0) {
+ if (connection.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
return;
}
@@ -299,46 +288,10 @@ public void hookPlaySession(ServerConnectedEvent event) {
ClientPlaySessionHandler playHandler = new ClientPlaySessionHandler(this.server, player);
SPAWNED_FIELD.invokeExact(playHandler, this.plugin.isLimboJoined(player));
connection.setActiveSessionHandler(connection.getState(), playHandler);
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
}
});
}
-
- static {
- CLOSED_MINECRAFT_CONNECTION = new ClosedMinecraftConnection(new ClosedChannel(new DummyEventPool()), null);
-
- try {
- CONNECTED_PLAYER_CONSTRUCTOR = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
- .findConstructor(ConnectedPlayer.class,
- MethodType.methodType(
- void.class,
- VelocityServer.class,
- GameProfile.class,
- MinecraftConnection.class,
- InetSocketAddress.class,
- String.class,
- boolean.class,
- IdentifiedKey.class
- )
- );
-
- DELEGATE_FIELD = MethodHandles.privateLookupIn(LoginInboundConnection.class, MethodHandles.lookup())
- .findGetter(LoginInboundConnection.class, "delegate", InitialInboundConnection.class);
-
- Field mcConnectionField = AuthSessionHandler.class.getDeclaredField("mcConnection");
- mcConnectionField.setAccessible(true);
- MC_CONNECTION_SETTER = LambdaUtil.setterOf(mcConnectionField);
-
- SPAWNED_FIELD = MethodHandles.privateLookupIn(ClientPlaySessionHandler.class, MethodHandles.lookup())
- .findSetter(ClientPlaySessionHandler.class, "spawned", boolean.class);
-
- Field tabListField = ConnectedPlayer.class.getDeclaredField("tabList");
- tabListField.setAccessible(true);
- TAB_LIST_SETTER = LambdaUtil.setterOf(tabListField);
- } catch (Throwable e) {
- throw new ReflectionException(e);
- }
- }
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
index bc027dbd..e9645661 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
@@ -61,8 +61,6 @@
import io.netty.channel.ChannelPipeline;
import io.netty.channel.EventLoop;
import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
import java.util.EnumSet;
import java.util.List;
@@ -71,35 +69,33 @@
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import java.util.function.BiConsumer;
import net.elytrium.commons.utils.reflection.ReflectionException;
import net.elytrium.limboapi.LimboAPI;
import net.elytrium.limboapi.injection.login.confirmation.LoginConfirmHandler;
import net.elytrium.limboapi.server.LimboSessionHandlerImpl;
-import net.elytrium.limboapi.utils.LambdaUtil;
+import net.elytrium.limboapi.utils.Reflection;
import net.kyori.adventure.text.Component;
import org.slf4j.Logger;
public class LoginTasksQueue {
- private static final MethodHandle PROFILE_FIELD;
+ private static final MethodHandle PROFILE_FIELD = Reflection.findSetter(ConnectedPlayer.class, "profile", GameProfile.class);
+ private static final MethodHandle SET_PERMISSION_FUNCTION_METHOD = Reflection.findVirtualVoid(ConnectedPlayer.class, "setPermissionFunction", PermissionFunction.class);
+ private static final MethodHandle INITIAL_CONNECT_SESSION_HANDLER_CONSTRUCTOR = Reflection.findConstructor(InitialConnectSessionHandler.class, ConnectedPlayer.class, VelocityServer.class);
+ private static final MethodHandle SET_CLIENT_BRAND = Reflection.findVirtualVoid(ConnectedPlayer.class, "setClientBrand", String.class);
+ private static final MethodHandle BRAND_CHANNEL_SETTER = Reflection.findSetter(ClientConfigSessionHandler.class, "brandChannel", String.class);
+ private static final MethodHandle CONNECT_TO_INITIAL_SERVER_METHOD = Reflection.findVirtual(AuthSessionHandler.class, "connectToInitialServer", CompletableFuture.class, ConnectedPlayer.class);
+
private static final PermissionProvider DEFAULT_PERMISSIONS;
- private static final MethodHandle SET_PERMISSION_FUNCTION_METHOD;
- private static final MethodHandle INITIAL_CONNECT_SESSION_HANDLER_CONSTRUCTOR;
- private static final BiConsumer MC_CONNECTION_SETTER;
- private static final MethodHandle CONNECT_TO_INITIAL_SERVER_METHOD;
- private static final MethodHandle SET_CLIENT_BRAND;
- private static final BiConsumer BRAND_CHANNEL_SETTER;
private final LimboAPI plugin;
- private final Object handler;
+ private final AuthSessionHandler handler;
private final VelocityServer server;
private final ConnectedPlayer player;
private final InboundConnection inbound;
private final Queue queue;
- public LoginTasksQueue(LimboAPI plugin, Object handler, VelocityServer server, ConnectedPlayer player,
- InboundConnection inbound, Queue queue) {
+ public LoginTasksQueue(LimboAPI plugin, AuthSessionHandler handler, VelocityServer server, ConnectedPlayer player, InboundConnection inbound, Queue queue) {
this.plugin = plugin;
this.handler = handler;
this.server = server;
@@ -128,79 +124,66 @@ private void finish() {
Logger logger = LimboAPI.getLogger();
this.plugin.getEventManagerHook().proceedProfile(this.player.getGameProfile());
- eventManager.fire(new GameProfileRequestEvent(this.inbound, this.player.getGameProfile(), this.player.isOnlineMode())).thenAcceptAsync(
- gameProfile -> {
- try {
- UUID uuid = this.plugin.getInitialID(this.player);
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
- connection.delayedWrite(new LegacyPlayerListItemPacket(
- LegacyPlayerListItemPacket.REMOVE_PLAYER,
- List.of(new LegacyPlayerListItemPacket.Item(uuid))
- ));
-
- connection.delayedWrite(new LegacyPlayerListItemPacket(
- LegacyPlayerListItemPacket.ADD_PLAYER,
- List.of(
- new LegacyPlayerListItemPacket.Item(uuid)
- .setName(gameProfile.getUsername())
- .setProperties(gameProfile.getGameProfile().getProperties())
- )
- ));
- } else if (connection.getState() != StateRegistry.CONFIG) {
- UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(uuid);
- playerInfoEntry.setDisplayName(new ComponentHolder(this.player.getProtocolVersion(), Component.text(gameProfile.getUsername())));
- playerInfoEntry.setProfile(gameProfile.getGameProfile());
+ eventManager.fire(new GameProfileRequestEvent(this.inbound, this.player.getGameProfile(), this.player.isOnlineMode())).thenAcceptAsync(gameProfile -> {
+ try {
+ UUID uuid = LimboAPI.getClientUniqueId(this.player);
+ if (connection.getProtocolVersion().noGreaterThan(ProtocolVersion.MINECRAFT_1_19_1)) {
+ // TODO try to remove it
+ connection.delayedWrite(new LegacyPlayerListItemPacket(LegacyPlayerListItemPacket.REMOVE_PLAYER,
+ List.of(new LegacyPlayerListItemPacket.Item(uuid))
+ ));
+ connection.delayedWrite(new LegacyPlayerListItemPacket(LegacyPlayerListItemPacket.ADD_PLAYER,
+ List.of(new LegacyPlayerListItemPacket.Item(uuid).setName(gameProfile.getUsername()).setProperties(gameProfile.getGameProfile().getProperties()))
+ ));
+ } else if (connection.getState() != StateRegistry.CONFIG) {
+ UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(uuid);
+ playerInfoEntry.setDisplayName(new ComponentHolder(this.player.getProtocolVersion(), Component.text(gameProfile.getUsername())));
+ playerInfoEntry.setProfile(gameProfile.getGameProfile());
+ connection.delayedWrite(new UpsertPlayerInfoPacket(EnumSet.of(UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, UpsertPlayerInfoPacket.Action.ADD_PLAYER), List.of(playerInfoEntry)));
+ }
- connection.delayedWrite(new UpsertPlayerInfoPacket(
- EnumSet.of(
- UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME,
- UpsertPlayerInfoPacket.Action.ADD_PLAYER),
- List.of(playerInfoEntry)));
+ PROFILE_FIELD.invokeExact(this.player, gameProfile.getGameProfile());
+
+ // From Velocity
+ eventManager.fire(new PermissionsSetupEvent(this.player, DEFAULT_PERMISSIONS)).thenAcceptAsync(event -> {
+ if (!connection.isClosed()) {
+ // Wait for permissions to load, then set the players' permission function
+ PermissionFunction function = event.createFunction(this.player);
+ if (function == null) {
+ logger.error(
+ "A plugin permission provider {} provided an invalid permission function"
+ + " for player {}. This is a bug in the plugin, not in Velocity. Falling"
+ + " back to the default permission function.",
+ event.getProvider().getClass().getName(),
+ this.player.getUsername()
+ );
+ } else {
+ try {
+ SET_PERMISSION_FUNCTION_METHOD.invokeExact(this.player, function);
+ } catch (Throwable t) {
+ logger.error("Exception while completing injection to {}", this.player, t);
+ }
}
- PROFILE_FIELD.invokeExact(this.player, gameProfile.getGameProfile());
-
- // From Velocity.
- eventManager
- .fire(new PermissionsSetupEvent(this.player, DEFAULT_PERMISSIONS))
- .thenAcceptAsync(event -> {
- if (!connection.isClosed()) {
- // Wait for permissions to load, then set the players' permission function.
- PermissionFunction function = event.createFunction(this.player);
- if (function == null) {
- logger.error(
- "A plugin permission provider {} provided an invalid permission function"
- + " for player {}. This is a bug in the plugin, not in Velocity. Falling"
- + " back to the default permission function.",
- event.getProvider().getClass().getName(),
- this.player.getUsername()
- );
- } else {
- try {
- SET_PERMISSION_FUNCTION_METHOD.invokeExact(this.player, function);
- } catch (Throwable ex) {
- logger.error("Exception while completing injection to {}", this.player, ex);
- }
- }
- try {
- this.initialize(connection);
- } catch (Throwable e) {
- throw new ReflectionException(e);
- }
- }
- }, connection.eventLoop());
- } catch (Throwable e) {
- logger.error("Exception while completing injection to {}", this.player, e);
+ try {
+ this.initialize(connection);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
+ }
}
}, connection.eventLoop());
+ } catch (Throwable t) {
+ logger.error("Exception while completing injection to {}", this.player, t);
+ }
+ }, connection.eventLoop());
}
- // From Velocity.
+ // From Velocity
@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
- private void initialize(MinecraftConnection connection) throws Throwable {
+ private void initialize(MinecraftConnection connection) {
connection.setAssociation(this.player);
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0
- || connection.getState() != StateRegistry.CONFIG) {
+ ProtocolVersion version = connection.getProtocolVersion();
+ if (version.lessThan(ProtocolVersion.MINECRAFT_1_20_2) || connection.getState() != StateRegistry.CONFIG) {
this.plugin.setState(connection, StateRegistry.PLAY);
}
@@ -208,13 +191,13 @@ private void initialize(MinecraftConnection connection) throws Throwable {
this.plugin.deject3rdParty(pipeline);
if (pipeline.get(Connections.FRAME_ENCODER) == null) {
- this.plugin.fixCompressor(pipeline, connection.getProtocolVersion());
+ this.plugin.fixCompressor(pipeline, version);
}
Logger logger = LimboAPI.getLogger();
this.server.getEventManager().fire(new LoginEvent(this.player)).thenAcceptAsync(event -> {
if (connection.isClosed()) {
- // The player was disconnected.
+ // The player was disconnected
this.server.getEventManager().fireAndForget(new DisconnectEvent(this.player, DisconnectEvent.LoginStatus.CANCELLED_BY_USER_BEFORE_COMPLETE));
} else {
Optional reason = event.getResult().getReasonComponent();
@@ -223,9 +206,9 @@ private void initialize(MinecraftConnection connection) throws Throwable {
} else {
if (this.server.registerConnection(this.player)) {
if (connection.getActiveSessionHandler() instanceof LoginConfirmHandler confirm) {
- confirm.waitForConfirmation(() -> this.connectToServer(logger, this.player, connection));
+ confirm.waitForConfirmation(() -> this.connectToServer(connection));
} else {
- this.connectToServer(logger, this.player, connection);
+ this.connectToServer(connection);
}
} else {
this.player.disconnect0(Component.translatable("velocity.error.already-connected-proxy"), false);
@@ -238,20 +221,18 @@ private void initialize(MinecraftConnection connection) throws Throwable {
});
}
+ @SuppressWarnings("unchecked")
@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
- private void connectToServer(Logger logger, ConnectedPlayer player, MinecraftConnection connection) {
- if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0) {
+ private void connectToServer(MinecraftConnection connection) {
+ if (connection.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
try {
- connection.setActiveSessionHandler(connection.getState(),
- (InitialConnectSessionHandler) INITIAL_CONNECT_SESSION_HANDLER_CONSTRUCTOR.invokeExact(this.player, this.server));
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ connection.setActiveSessionHandler(connection.getState(), (InitialConnectSessionHandler) INITIAL_CONNECT_SESSION_HANDLER_CONSTRUCTOR.invokeExact(this.player, this.server));
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
} else if (connection.getState() == StateRegistry.PLAY) {
// Synchronize with the client to ensure that it will not corrupt CONFIG state with PLAY packets
- ((LimboSessionHandlerImpl) connection.getActiveSessionHandler())
- .disconnectToConfig(() -> this.connectToServer(logger, player, connection));
-
+ ((LimboSessionHandlerImpl) connection.getActiveSessionHandler()).disconnectToConfig(() -> this.connectToServer(connection));
return; // Re-running this method due to synchronization with the client
} else {
ClientConfigSessionHandler configHandler = new ClientConfigSessionHandler(this.server, this.player);
@@ -268,9 +249,9 @@ private void connectToServer(Logger logger, ConnectedPlayer player, MinecraftCon
try {
this.server.getEventManager().fireAndForget(new PlayerClientBrandEvent(this.player, sessionHandler.getBrand()));
SET_CLIENT_BRAND.invokeExact(this.player, sessionHandler.getBrand());
- BRAND_CHANNEL_SETTER.accept(configHandler, "minecraft:brand");
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ BRAND_CHANNEL_SETTER.invokeExact(configHandler, "minecraft:brand");
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
}
}
@@ -278,47 +259,26 @@ private void connectToServer(Logger logger, ConnectedPlayer player, MinecraftCon
this.plugin.setActiveSessionHandler(connection, StateRegistry.CONFIG, configHandler);
}
- this.server.getEventManager().fire(new PostLoginEvent(this.player)).thenAccept(postLoginEvent -> {
+ this.server.getEventManager().fire(new PostLoginEvent(this.player)).thenCompose(postLoginEvent -> {
try {
- MC_CONNECTION_SETTER.accept(this.handler, connection);
- CONNECT_TO_INITIAL_SERVER_METHOD.invoke((AuthSessionHandler) this.handler, this.player);
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ LoginListener.MC_CONNECTION_SETTER.invokeExact(this.handler, connection);
+ return (CompletableFuture) CONNECT_TO_INITIAL_SERVER_METHOD.invokeExact(this.handler, this.player);
+ } catch (Throwable t) {
+ throw new ReflectionException(t);
}
+ }).exceptionally(t -> {
+ LimboAPI.getLogger().error("Exception while connecting {} to initial server", this.player, t);
+ return null;
});
}
static {
try {
- PROFILE_FIELD = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
- .findSetter(ConnectedPlayer.class, "profile", GameProfile.class);
-
Field defaultPermissionsField = ConnectedPlayer.class.getDeclaredField("DEFAULT_PERMISSIONS");
defaultPermissionsField.setAccessible(true);
DEFAULT_PERMISSIONS = (PermissionProvider) defaultPermissionsField.get(null);
-
- SET_PERMISSION_FUNCTION_METHOD = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
- .findVirtual(ConnectedPlayer.class, "setPermissionFunction", MethodType.methodType(void.class, PermissionFunction.class));
-
- INITIAL_CONNECT_SESSION_HANDLER_CONSTRUCTOR = MethodHandles
- .privateLookupIn(InitialConnectSessionHandler.class, MethodHandles.lookup())
- .findConstructor(InitialConnectSessionHandler.class, MethodType.methodType(void.class, ConnectedPlayer.class, VelocityServer.class));
-
- CONNECT_TO_INITIAL_SERVER_METHOD = MethodHandles.privateLookupIn(AuthSessionHandler.class, MethodHandles.lookup())
- .findVirtual(AuthSessionHandler.class, "connectToInitialServer", MethodType.methodType(CompletableFuture.class, ConnectedPlayer.class));
-
- Field mcConnectionField = AuthSessionHandler.class.getDeclaredField("mcConnection");
- mcConnectionField.setAccessible(true);
- MC_CONNECTION_SETTER = LambdaUtil.setterOf(mcConnectionField);
-
- SET_CLIENT_BRAND = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
- .findVirtual(ConnectedPlayer.class, "setClientBrand", MethodType.methodType(void.class, String.class));
-
- Field brandChannelField = ClientConfigSessionHandler.class.getDeclaredField("brandChannel");
- brandChannelField.setAccessible(true);
- BRAND_CHANNEL_SETTER = LambdaUtil.setterOf(brandChannelField);
- } catch (Throwable e) {
- throw new ReflectionException(e);
+ } catch (Exception t) {
+ throw new ReflectionException(t);
}
}
}
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/login/confirmation/LoginConfirmHandler.java b/plugin/src/main/java/net/elytrium/limboapi/injection/login/confirmation/LoginConfirmHandler.java
index c8a1fc3a..e9d14ba0 100644
--- a/plugin/src/main/java/net/elytrium/limboapi/injection/login/confirmation/LoginConfirmHandler.java
+++ b/plugin/src/main/java/net/elytrium/limboapi/injection/login/confirmation/LoginConfirmHandler.java
@@ -26,19 +26,15 @@
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.util.ReferenceCountUtil;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import net.elytrium.commons.utils.reflection.ReflectionException;
import net.elytrium.limboapi.LimboAPI;
+import net.elytrium.limboapi.server.LimboSessionHandlerImpl;
public class LoginConfirmHandler implements MinecraftSessionHandler {
- private static final MethodHandle TEARDOWN_METHOD;
-
private final LimboAPI plugin;
private final CompletableFuture