Skip to content

Commit 8ce7bd0

Browse files
mdxd44mdxd44
committed
Merge remote-tracking branch 'refs/remotes/origin/1.21.9-support' into 1.2.0
# Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # HEADER.txt # HEADER_MIXED.txt # api/HEADER.txt # api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java # api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java # api/src/main/java/net/elytrium/limboapi/api/protocol/map/MapPalette.java # api/src/main/java/net/elytrium/limboapi/api/protocol/packets/PacketFactory.java # build.gradle # gradle/wrapper/gradle-wrapper.properties # plugin/build.gradle # plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginListener.java # plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java # plugin/src/main/java/net/elytrium/limboapi/injection/packet/UpsertPlayerInfoHook.java # plugin/src/main/java/net/elytrium/limboapi/injection/tablist/RewritingTabList.java # plugin/src/main/java/net/elytrium/limboapi/mcprotocollib/BitStorage116.java # plugin/src/main/java/net/elytrium/limboapi/protocol/data/StorageUtils.java # plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/ChunkDataPacket.java # plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/DefaultSpawnPositionPacket.java # plugin/src/main/java/net/elytrium/limboapi/protocol/packets/s2c/PositionRotationPacket.java # plugin/src/main/java/net/elytrium/limboapi/protocol/util/NetworkSection.java # plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java # plugin/src/main/java/net/elytrium/limboapi/server/LimboPlayerImpl.java # plugin/src/main/java/net/elytrium/limboapi/server/item/SimpleItemComponentManager.java # plugin/src/main/java/net/elytrium/limboapi/server/item/type/BooleanItemComponent.java # plugin/src/main/java/net/elytrium/limboapi/server/item/type/ComponentsItemComponent.java # plugin/src/main/java/net/elytrium/limboapi/server/item/type/DyedColorItemComponent.java # plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleBlock.java # plugin/src/main/java/net/elytrium/limboapi/server/world/SimpleItem.java # plugin/src/main/java/net/elytrium/limboapi/utils/LambdaUtil.java # plugin/src/main/java/net/elytrium/limboapi/utils/ProtocolTools.java
2 parents 7203919 + 5b4262e commit 8ce7bd0

File tree

133 files changed

+462
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+462
-170
lines changed

‎.github/workflows/build.yml‎

Whitespace-only changes.

‎.github/workflows/release.yml‎

Whitespace-only changes.

‎api/src/main/java/net/elytrium/limboapi/api/Limbo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/LimboSessionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/chunk/BuiltInBiome.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/chunk/Dimension.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBiome.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

‎api/src/main/java/net/elytrium/limboapi/api/chunk/VirtualBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 - 2024 Elytrium
2+
* Copyright (C) 2021 - 2025 Elytrium
33
*
44
* The LimboAPI (excluding the LimboAPI plugin) is licensed under the terms of the MIT License. For more details,
55
* reference the LICENSE file in the api top-level directory.

0 commit comments

Comments
 (0)