Minecraft 1.21.6

Fixes #119
Closes #117
This commit is contained in:
LOOHP committed 2025-06-20 22:38:09 +01:00
1 parent fd7b071b5d
commit 07ecafa7da
27 files changed
+590 -118

No files matched your search

+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_16</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_16_2</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_16_4</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_17</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_18</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_18_2</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_19</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_19_3</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_19_4</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_20</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_20_2</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_20_3</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_20_5</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_20_6</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_1</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_2</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_3</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_4</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_5</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+93
View File
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ This file is part of ImageFrame.
~
~ Copyright (C) 2025. LoohpJames <jamesloohp@gmail.com>
~ Copyright (C) 2025. Contributors
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-V1_21_6</artifactId>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.21.6-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.21.6-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Abstraction</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,362 @@
/*
* This file is part of ImageFrame.
*
* Copyright (C) 2025. LoohpJames <jamesloohp@gmail.com>
* Copyright (C) 2025. Contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.loohp.imageframe.nms;
import com.google.common.collect.Collections2;
import com.loohp.imageframe.objectholders.CombinedMapItemInfo;
import com.loohp.imageframe.objectholders.MutablePair;
import com.loohp.imageframe.utils.ReflectionUtils;
import com.loohp.imageframe.utils.UUIDUtils;
import net.kyori.adventure.key.Key;
import net.minecraft.EnumChatFormat;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.component.DataComponents;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.chat.ChatModifier;
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
import net.minecraft.network.protocol.game.PacketPlayOutMap;
import net.minecraft.network.syncher.DataWatcher;
import net.minecraft.network.syncher.DataWatcherObject;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.EntityPlayer;
import net.minecraft.server.level.WorldServer;
import net.minecraft.world.entity.decoration.EntityItemFrame;
import net.minecraft.world.entity.player.EntityHuman;
import net.minecraft.world.entity.player.PlayerInventory;
import net.minecraft.world.item.component.CustomData;
import net.minecraft.world.item.component.ItemLore;
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
import net.minecraft.world.level.saveddata.maps.MapIcon;
import net.minecraft.world.level.saveddata.maps.MapId;
import net.minecraft.world.level.saveddata.maps.PersistentIdCounts;
import net.minecraft.world.level.saveddata.maps.WorldMap;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R5.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R5.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_21_R5.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_21_R5.map.CraftMapCursor;
import org.bukkit.craftbukkit.v1_21_R5.map.CraftMapView;
import org.bukkit.craftbukkit.v1_21_R5.map.RenderData;
import org.bukkit.craftbukkit.v1_21_R5.util.CraftChatMessage;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.map.MapCursor;
import org.bukkit.map.MapView;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@SuppressWarnings("unused")
public class V1_21_6 extends NMSWrapper {
private final Field nmsEntityByteDataWatcherField;
private final Field craftMapViewWorldMapField;
private final Field persistentIdCountsLastMapIdField;
private final Field renderDataCursorsField;
public V1_21_6() {
try {
nmsEntityByteDataWatcherField = ReflectionUtils.findDeclaredField(net.minecraft.world.entity.Entity.class, DataWatcherObject.class, "DATA_SHARED_FLAGS_ID", "am");
craftMapViewWorldMapField = CraftMapView.class.getDeclaredField("worldMap");
Field persistentIdCountsLastMapIdField0;
try {
persistentIdCountsLastMapIdField0 = ReflectionUtils.findDeclaredField(PersistentIdCounts.class, int.class, "lastMapId", "d");
} catch (NoSuchFieldException e) {
persistentIdCountsLastMapIdField0 = ReflectionUtils.findDeclaredField(PersistentIdCounts.class, AtomicInteger.class, "lastMapId", "d");
}
persistentIdCountsLastMapIdField = persistentIdCountsLastMapIdField0;
renderDataCursorsField = RenderData.class.getField("cursors");
} catch (NoSuchFieldException e) {
throw new RuntimeException(e);
}
}
public WorldMap getWorldMap(MapView mapView) {
try {
CraftMapView craftMapView = (CraftMapView) mapView;
craftMapViewWorldMapField.setAccessible(true);
return (WorldMap) craftMapViewWorldMapField.get(craftMapView);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
@Override
public void setColors(MapView mapView, byte[] colors) {
if (colors.length != COLOR_ARRAY_LENGTH) {
throw new IllegalArgumentException("colors array length must be " + COLOR_ARRAY_LENGTH);
}
WorldMap nmsWorldMap = getWorldMap(mapView);
nmsWorldMap.h = colors;
}
@Override
public Collection<Player> getViewers(MapView mapView) {
WorldMap nmsWorldMap = getWorldMap(mapView);
Map<EntityHuman, WorldMap.WorldMapHumanTracker> humansMap = nmsWorldMap.q;
return Collections2.transform(humansMap.keySet(), e -> (Player) e.getBukkitEntity());
}
@Override
public boolean hasViewers(MapView mapView) {
WorldMap nmsWorldMap = getWorldMap(mapView);
Map<EntityHuman, WorldMap.WorldMapHumanTracker> humansMap = nmsWorldMap.q;
return !humansMap.isEmpty();
}
@Override
public MapIcon toNMSMapIcon(MapCursor mapCursor) {
Holder<MapDecorationType> decorationTypeHolder = toNMSMapIconType(mapCursor.getType());
IChatBaseComponent iChat = CraftChatMessage.fromStringOrNull(mapCursor.getCaption());
return new MapIcon(decorationTypeHolder, mapCursor.getX(), mapCursor.getY(), mapCursor.getDirection(), Optional.ofNullable(iChat));
}
@Override
public Holder<MapDecorationType> toNMSMapIconType(MapCursor.Type type) {
return CraftMapCursor.CraftType.bukkitToMinecraftHolder(type);
}
@Override
public boolean isRenderOnFrame(MapCursor.Type type) {
Holder<MapDecorationType> decorationTypeHolder = toNMSMapIconType(type);
return decorationTypeHolder.a().c();
}
@Override
public int getNextAvailableMapId(World world) {
try {
persistentIdCountsLastMapIdField.setAccessible(true);
WorldServer worldServer = ((CraftWorld) world).getHandle();
PersistentIdCounts persistentIdCounts = worldServer.q().J().x().a(PersistentIdCounts.b);
if (persistentIdCountsLastMapIdField.getType().equals(AtomicInteger.class)) {
AtomicInteger atomicInteger = (AtomicInteger) persistentIdCountsLastMapIdField.get(persistentIdCounts);
return atomicInteger.get() + 1;
} else {
return persistentIdCountsLastMapIdField.getInt(persistentIdCounts) + 1;
}
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
@SuppressWarnings("deprecation")
@Override
public MapView getMapOrCreateMissing(World world, int id) {
try {
MapView mapView = Bukkit.getMap(id);
if (mapView != null) {
return mapView;
}
persistentIdCountsLastMapIdField.setAccessible(true);
Location spawnLocation = world.getSpawnLocation();
WorldServer worldServer = ((CraftWorld) world).getHandle();
ResourceKey<net.minecraft.world.level.World> worldTypeKey = worldServer.aj();
WorldMap worldMap = WorldMap.a(spawnLocation.getX(), spawnLocation.getZ(), (byte) 3, false, false, worldTypeKey);
MapId mapId = new MapId(id);
worldServer.a(mapId, worldMap);
PersistentIdCounts persistentIdCounts = worldServer.q().J().x().a(PersistentIdCounts.b);
if (persistentIdCountsLastMapIdField.getType().equals(AtomicInteger.class)) {
AtomicInteger atomicInteger = (AtomicInteger) persistentIdCountsLastMapIdField.get(persistentIdCounts);
atomicInteger.getAndUpdate(lastMapId -> Math.max(lastMapId, id));
} else {
int lastMapId = persistentIdCountsLastMapIdField.getInt(persistentIdCounts);
persistentIdCountsLastMapIdField.setInt(persistentIdCounts, Math.max(lastMapId, id));
}
persistentIdCounts.e();
return Bukkit.getMap(id);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
@SuppressWarnings("unchecked")
@Override
public MutablePair<byte[], List<MapCursor>> bukkitRenderMap(MapView mapView, Player player) {
try {
CraftMapView craftMapView = (CraftMapView) mapView;
CraftPlayer craftPlayer = (CraftPlayer) player;
RenderData renderData = craftMapView.render(craftPlayer);
return new MutablePair<>(renderData.buffer, (List<MapCursor>) renderDataCursorsField.get(renderData));
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
@Override
public Set<Player> getEntityTrackers(Entity entity) {
return new HashSet<>(entity.getTrackedBy());
}
@Override
public PacketPlayOutMap createMapPacket(int mapId, byte[] colors, Collection<MapCursor> cursors) {
List<MapIcon> mapIcons = cursors == null ? null : cursors.stream().map(this::toNMSMapIcon).collect(Collectors.toList());
WorldMap.c c = colors == null ? null : new WorldMap.c(0, 0, 128, 128, colors);
return new PacketPlayOutMap(new MapId(mapId), (byte) 0, false, Optional.ofNullable(mapIcons), Optional.ofNullable(c));
}
@Override
public PacketPlayOutEntityMetadata createItemFrameItemChangePacket(int entityId, ItemStack itemStack) {
List<DataWatcher.c<?>> dataWatchers = Collections.singletonList(DataWatcher.c.a(EntityItemFrame.d, CraftItemStack.asNMSCopy(itemStack)));
return new PacketPlayOutEntityMetadata(entityId, dataWatchers);
}
@SuppressWarnings("unchecked")
@Override
public Object createEntityFlagsPacket(Entity entity, Boolean invisible, Boolean glowing) {
try {
int entityId = entity.getEntityId();
net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) entity).getHandle();
nmsEntityByteDataWatcherField.setAccessible(true);
DataWatcher watcher = nmsEntity.au();
DataWatcherObject<Byte> byteField = (DataWatcherObject<Byte>) nmsEntityByteDataWatcherField.get(null);
byte value = watcher.a(byteField);
if (invisible != null) {
if (invisible) {
value = (byte) (value | 0x20);
} else {
value = (byte) (value & ~0x20);
}
}
if (glowing != null) {
if (glowing) {
value = (byte) (value | 0x40);
} else {
value = (byte) (value & ~0x40);
}
}
List<DataWatcher.c<?>> dataWatchers = Collections.singletonList(DataWatcher.c.a(byteField, value));
return new PacketPlayOutEntityMetadata(entityId, dataWatchers);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Override
public void sendPacket(Player player, Object packet) {
((CraftPlayer) player).getHandle().g.sendPacket((Packet<?>) packet);
}
@SuppressWarnings("OptionalGetWithoutIsPresent")
@Override
public CombinedMapItemInfo getCombinedMapItemInfo(ItemStack itemStack) {
net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
CustomData customData = nmsItemStack.a(DataComponents.b);
if (customData == null) {
return null;
}
NBTTagCompound tag = customData.d();
if (!tag.b(CombinedMapItemInfo.KEY)) {
return null;
}
int imageMapIndex = tag.b(CombinedMapItemInfo.KEY, -1);
if (!tag.b(CombinedMapItemInfo.PLACEMENT_UUID_KEY) || !tag.b(CombinedMapItemInfo.PLACEMENT_YAW_KEY)) {
return new CombinedMapItemInfo(imageMapIndex);
}
float yaw = tag.b(CombinedMapItemInfo.PLACEMENT_YAW_KEY, 0F);
UUID uuid = UUIDUtils.fromIntArray(tag.k(CombinedMapItemInfo.PLACEMENT_UUID_KEY).get());
return new CombinedMapItemInfo(imageMapIndex, new CombinedMapItemInfo.PlacementInfo(yaw, uuid));
}
@Override
public ItemStack withCombinedMapItemInfo(ItemStack itemStack, CombinedMapItemInfo combinedMapItemInfo) {
net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
CustomData customData = nmsItemStack.a(DataComponents.b, CustomData.a);
NBTTagCompound tag = customData.d();
tag.a(CombinedMapItemInfo.KEY, combinedMapItemInfo.getImageMapIndex());
if (combinedMapItemInfo.hasPlacement()) {
CombinedMapItemInfo.PlacementInfo placement = combinedMapItemInfo.getPlacement();
tag.a(CombinedMapItemInfo.PLACEMENT_YAW_KEY, placement.getYaw());
tag.a(CombinedMapItemInfo.PLACEMENT_UUID_KEY, UUIDUtils.toIntArray(placement.getUniqueId()));
}
nmsItemStack.b(DataComponentPatch.a().a(DataComponents.b, CustomData.a(tag)).a());
return CraftItemStack.asCraftMirror(nmsItemStack);
}
@Override
public ItemStack withInvisibleItemFrameMeta(ItemStack itemStack) {
if (itemStack == null || itemStack.getType().equals(Material.AIR)) {
return itemStack;
}
net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
ItemLore itemLore = nmsItemStack.a(DataComponents.j, ItemLore.a);
List<IChatBaseComponent> loreLines = new ArrayList<>(itemLore.a());
loreLines.add(0, IChatBaseComponent.c("effect.minecraft.invisibility").c(ChatModifier.a.c(EnumChatFormat.h).b(false)));
nmsItemStack.b(DataComponentPatch.a().a(DataComponents.j, new ItemLore(loreLines)).a());
ItemStack modified = CraftItemStack.asCraftMirror(nmsItemStack);
ItemMeta itemMeta = modified.getItemMeta();
if (itemMeta == null) {
return itemStack;
}
itemMeta.addEnchant(Enchantment.LUCK_OF_THE_SEA, 1, true);
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
modified.setItemMeta(itemMeta);
return modified;
}
@Override
public List<ItemStack> giveItems(Player player, List<ItemStack> itemStacks) {
List<ItemStack> leftovers = new ArrayList<>();
EntityPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
PlayerInventory inventory = nmsPlayer.gs();
for (ItemStack itemStack : itemStacks) {
net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
boolean added = inventory.g(nmsItemStack);
if (!added || !nmsItemStack.f()) {
leftovers.add(CraftItemStack.asBukkitCopy(nmsItemStack));
}
}
nmsPlayer.cn.d();
return leftovers;
}
@SuppressWarnings("PatternValidation")
public Key getWorldNamespacedKey(World world) {
NamespacedKey key = world.getKey();
return Key.key(key.getNamespace(), key.getKey());
}
}
+5 -5
View File
@@ -27,7 +27,7 @@
<parent>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
</parent>
<artifactId>ImageFrame-Abstraction</artifactId>
@@ -48,25 +48,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
+11 -5
View File
@@ -26,7 +26,7 @@
<groupId>com.loohp</groupId>
<artifactId>ImageFrame</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
<packaging>jar</packaging>
<name>ImageFrame</name>
@@ -292,25 +292,25 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.18.0</version>
<version>4.23.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -463,5 +463,11 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-V1_21_6</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
@@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -98,16 +99,24 @@ public class IFPlayerManager implements AutoCloseable, Listener {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8))) {
return IFPlayer.load(this, GSON.fromJson(reader, JsonObject.class));
} catch (Exception e) {
throw new RuntimeException("Unable to load ImageFrame player data from " + file.getAbsolutePath(), e);
}
} else {
try {
return IFPlayer.create(this, uuid);
} catch (Exception e) {
throw new RuntimeException("Unable to create ImageFrame player data for " + uuid, e);
new RuntimeException("Unable to load ImageFrame player data from " + file.getAbsolutePath(), e).printStackTrace();
try {
Files.copy(file.toPath(), new File(file.getParentFile(), file.getName() + ".bak").toPath());
} catch (IOException ex) {
new RuntimeException("Unable to backup ImageFrame player data from " + file.getAbsolutePath(), ex).printStackTrace();
}
}
}
return createNewIfPlayer(uuid);
});
}
private IFPlayer createNewIfPlayer(UUID uuid) {
try {
return IFPlayer.create(this, uuid);
} catch (Exception e) {
throw new RuntimeException("Unable to create ImageFrame player data for " + uuid, e);
}
}
}
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
public enum MCVersion {
V1_21_6("1.21.6", "1_21_R5", 32),
V1_21_5("1.21.5", "1_21_R4", 31),
V1_21_4("1.21.4", "1_21_R3", 30),
V1_21_3("1.21.3", "1_21_R2", 29),
+2 -1
View File
@@ -26,7 +26,7 @@
<groupId>com.loohp</groupId>
<artifactId>ImageFrame-Parent</artifactId>
<version>1.8.2.0</version>
<version>1.8.3.0</version>
<packaging>pom</packaging>
<properties>
@@ -55,6 +55,7 @@
<module>V1_21_3</module>
<module>V1_21_4</module>
<module>V1_21_5</module>
<module>V1_21_6</module>
<module>common</module>
</modules>
</project>