Skip to content

Commit 9a7e2ad

Browse files
LoneDev6LoneDev6
committed
1.21.6 compatibility
1 parent 58537f5 commit 9a7e2ad

File tree

45 files changed

+1711
-121
lines changed

Some content is hidden

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

45 files changed

+1711
-121
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ target/
118118

119119

120120
# Ignore automatically generated contents
121+
/fastnbt_nms_v1_21_6_mojangmap/src/main/java/beer/
122+
/fastnbt_nms_v1_21_6_spigotmap/src/main/java/beer/
123+
121124
/fastnbt_nms_v1_21_5_mojangmap/src/main/java/beer/
122125
/fastnbt_nms_v1_21_5_spigotmap/src/main/java/beer/
123126

‎.mvn-exec/GenerateNms.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ handleRecursiveFiles(srcFolder, (data, file) => {
7676
spigotMapData = spigotMapData.replaceAll("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v1_21_R4")
7777
spigotMapData = spigotMapData.replaceAll("if(IS_FIELD_HANDLE_PUBLIC) return craftItemStack.handle;", "")
7878
}
79+
else if(file.includes("1_21_6")) {
80+
spigotMapData = spigotMapData.replaceAll("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v1_21_R5")
81+
spigotMapData = spigotMapData.replaceAll("if(IS_FIELD_HANDLE_PUBLIC) return craftItemStack.handle;", "")
82+
}
7983
copyFileToFolder(spigotMapData, file.replaceAll(nmsFolder, spigotmapFolder).replaceAll("impl", 'impl_spigotmap'));
8084
});
8185
});

‎FastNbt-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>FastNbt</artifactId>
77
<groupId>beer.devs</groupId>
8-
<version>1.4.8</version>
8+
<version>1.4.9</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎FastNbt-core/src/main/java/beer/devs/fastnbt/nms/NMSImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public class NMSImpl
1212
{
13-
public static final String LIB_VERSION = "1.4.8";
13+
public static final String LIB_VERSION = "1.4.9";
1414

1515
private static final String NMS_IMPL_PACKAGE = "beer.devs.fastnbt.nms.nbt.impl";
1616
private static final String NMS_IMPL_PACKAGE_SPIGOTMAP = "beer.devs.fastnbt.nms.nbt.impl_spigotmap";

‎FastNbt-core/src/main/java/beer/devs/fastnbt/nms/Version.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public enum Version
3030
v1_21_1(141, 767, "1.21.1"),
3131
v1_21_3(143, 768, "1.21.3"),
3232
v1_21_4(144, 769, "1.21.4"),
33-
v1_21_5(145, 770, "1.21.5");
33+
v1_21_5(145, 770, "1.21.5"),
34+
v1_21_6(146, 771, "1.21.6")
35+
;
3436

3537
private static Version version;
3638

‎FastNbt-core/src/main/java/beer/devs/fastnbt/nms/nbt/NBT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class NBT
3030
}
3131
catch (Throwable ex)
3232
{
33-
Bukkit.getLogger().severe("This server is not compatible with FastNBT" + NMSImpl.LIB_VERSION + ". Server: " + Bukkit.getVersion() + " (NMS: " + Version.get() + ")");
33+
Bukkit.getLogger().severe("This server is not compatible with FastNBT " + NMSImpl.LIB_VERSION + ". Server: " + Bukkit.getVersion() + " (NMS: " + Version.get() + ")");
3434
ex.printStackTrace();
3535
Bukkit.shutdown();
3636
}

‎FastNbt-jar/pom.xml‎

Lines changed: 32 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,13 @@
55
<parent>
66
<artifactId>FastNbt</artifactId>
77
<groupId>beer.devs</groupId>
8-
<version>1.4.8</version>
8+
<version>1.4.9</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>FastNbt-jar</artifactId>
1313
<packaging>jar</packaging>
1414

15-
<profiles>
16-
<profile>
17-
<id>local_build</id>
18-
<activation>
19-
<activeByDefault>false</activeByDefault>
20-
<os>
21-
<family>Windows</family>
22-
</os>
23-
</activation>
24-
<build>
25-
<plugins>
26-
<plugin>
27-
<groupId>org.apache.maven.plugins</groupId>
28-
<artifactId>maven-antrun-plugin</artifactId>
29-
<version>3.1.0</version>
30-
<executions>
31-
<execution>
32-
<phase>package</phase>
33-
<configuration>
34-
<target>
35-
<!-- Copy JAR to multiple directories -->
36-
<copy file="${basedir}/../output/${project.parent.artifactId}.jar" todir="C:/Progetti/Minecraft/TestServer/1.20/plugins/"/>
37-
<copy file="${basedir}/../output/${project.parent.artifactId}.jar" todir="C:/Progetti/Minecraft/TestServer/1.20.6/plugins/"/>
38-
<copy file="${basedir}/../output/${project.parent.artifactId}.jar" todir="C:/Progetti/Minecraft/TestServer/1.21.1/plugins/"/>
39-
<copy file="${basedir}/../output/${project.parent.artifactId}.jar" todir="C:/Progetti/Minecraft/TestServer/1.21.3/plugins/"/>
40-
<copy file="${basedir}/../output/${project.parent.artifactId}.jar" todir="C:/Progetti/Minecraft/TestServer/1.21.4/plugins/"/>
41-
</target>
42-
</configuration>
43-
<goals>
44-
<goal>run</goal>
45-
</goals>
46-
</execution>
47-
</executions>
48-
</plugin>
49-
</plugins>
50-
</build>
51-
</profile>
52-
</profiles>
53-
5415
<build>
5516
<plugins>
5617
<!-- To remove the manifest files-->
@@ -91,105 +52,116 @@
9152
<dependency>
9253
<groupId>beer.devs</groupId>
9354
<artifactId>FastNbt-core</artifactId>
94-
<version>1.4.8</version>
55+
<version>1.4.9</version>
56+
</dependency>
57+
58+
<dependency>
59+
<groupId>beer.devs</groupId>
60+
<artifactId>fastnbt_nms_v1_21_6_mojangmap</artifactId>
61+
<version>1.4.9</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>beer.devs</groupId>
65+
<artifactId>fastnbt_nms_v1_21_6_spigotmap</artifactId>
66+
<version>1.4.9</version>
9567
</dependency>
9668

9769
<dependency>
9870
<groupId>beer.devs</groupId>
9971
<artifactId>fastnbt_nms_v1_21_5_mojangmap</artifactId>
100-
<version>1.4.8</version>
72+
<version>1.4.9</version>
10173
</dependency>
10274
<dependency>
10375
<groupId>beer.devs</groupId>
10476
<artifactId>fastnbt_nms_v1_21_5_spigotmap</artifactId>
105-
<version>1.4.8</version>
77+
<version>1.4.9</version>
10678
</dependency>
10779

10880
<dependency>
10981
<groupId>beer.devs</groupId>
11082
<artifactId>fastnbt_nms_v1_21_4_mojangmap</artifactId>
111-
<version>1.4.8</version>
83+
<version>1.4.9</version>
11284
</dependency>
11385
<dependency>
11486
<groupId>beer.devs</groupId>
11587
<artifactId>fastnbt_nms_v1_21_4_spigotmap</artifactId>
116-
<version>1.4.8</version>
88+
<version>1.4.9</version>
11789
</dependency>
11890
<dependency>
11991
<groupId>beer.devs</groupId>
12092
<artifactId>fastnbt_nms_v1_21_3_mojangmap</artifactId>
121-
<version>1.4.8</version>
93+
<version>1.4.9</version>
12294
</dependency>
12395
<dependency>
12496
<groupId>beer.devs</groupId>
12597
<artifactId>fastnbt_nms_v1_21_3_spigotmap</artifactId>
126-
<version>1.4.8</version>
98+
<version>1.4.9</version>
12799
</dependency>
128100
<dependency>
129101
<groupId>beer.devs</groupId>
130102
<artifactId>fastnbt_nms_v1_21_1_mojangmap</artifactId>
131-
<version>1.4.8</version>
103+
<version>1.4.9</version>
132104
</dependency>
133105
<dependency>
134106
<groupId>beer.devs</groupId>
135107
<artifactId>fastnbt_nms_v1_21_1_spigotmap</artifactId>
136-
<version>1.4.8</version>
108+
<version>1.4.9</version>
137109
</dependency>
138110
<dependency>
139111
<groupId>beer.devs</groupId>
140112
<artifactId>fastnbt_nms_v1_20_6_mojangmap</artifactId>
141-
<version>1.4.8</version>
113+
<version>1.4.9</version>
142114
</dependency>
143115
<dependency>
144116
<groupId>beer.devs</groupId>
145117
<artifactId>fastnbt_nms_v1_20_6_spigotmap</artifactId>
146-
<version>1.4.8</version>
118+
<version>1.4.9</version>
147119
</dependency>
148120

149121
<dependency>
150122
<groupId>beer.devs</groupId>
151123
<artifactId>fastnbt_nms_v1_20_4</artifactId>
152-
<version>1.4.8</version>
124+
<version>1.4.9</version>
153125
</dependency>
154126
<dependency>
155127
<groupId>beer.devs</groupId>
156128
<artifactId>fastnbt_nms_v1_20_R3</artifactId>
157-
<version>1.4.8</version>
129+
<version>1.4.9</version>
158130
</dependency>
159131
<dependency>
160132
<groupId>beer.devs</groupId>
161133
<artifactId>fastnbt_nms_v1_20_R2</artifactId>
162-
<version>1.4.8</version>
134+
<version>1.4.9</version>
163135
</dependency>
164136
<dependency>
165137
<groupId>beer.devs</groupId>
166138
<artifactId>fastnbt_nms_v1_20_R1</artifactId>
167-
<version>1.4.8</version>
139+
<version>1.4.9</version>
168140
</dependency>
169141
<dependency>
170142
<groupId>beer.devs</groupId>
171143
<artifactId>fastnbt_nms_v1_19_R3</artifactId>
172-
<version>1.4.8</version>
144+
<version>1.4.9</version>
173145
</dependency>
174146
<dependency>
175147
<groupId>beer.devs</groupId>
176148
<artifactId>fastnbt_nms_v1_19_R2</artifactId>
177-
<version>1.4.8</version>
149+
<version>1.4.9</version>
178150
</dependency>
179151
<dependency>
180152
<groupId>beer.devs</groupId>
181153
<artifactId>fastnbt_nms_v1_19_R1</artifactId>
182-
<version>1.4.8</version>
154+
<version>1.4.9</version>
183155
</dependency>
184156
<dependency>
185157
<groupId>beer.devs</groupId>
186158
<artifactId>fastnbt_nms_v1_18_R2</artifactId>
187-
<version>1.4.8</version>
159+
<version>1.4.9</version>
188160
</dependency>
189161
<dependency>
190162
<groupId>beer.devs</groupId>
191163
<artifactId>fastnbt_nms_v1_17_R1</artifactId>
192-
<version>1.4.8</version>
164+
<version>1.4.9</version>
193165
</dependency>
194166
</dependencies>
195167

‎fastnbt_nms_v1_17_R1/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<artifactId>FastNbt</artifactId>
1212
<groupId>beer.devs</groupId>
13-
<version>1.4.8</version>
13+
<version>1.4.9</version>
1414
</parent>
1515

1616
<properties>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>beer.devs</groupId>
4848
<artifactId>FastNbt-core</artifactId>
49-
<version>1.4.8</version>
49+
<version>1.4.9</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
</dependencies>

‎fastnbt_nms_v1_18_R2/fastnbt_nms_v1_18_R2.iml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<configuration>
66
<autoDetectTypes>
77
<platformType>MCP</platformType>
8-
<platformType>ADVENTURE</platformType>
9-
<platformType>PAPER</platformType>
108
</autoDetectTypes>
119
<projectReimportVersion>1</projectReimportVersion>
1210
</configuration>

‎fastnbt_nms_v1_18_R2/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<artifactId>FastNbt</artifactId>
1212
<groupId>beer.devs</groupId>
13-
<version>1.4.8</version>
13+
<version>1.4.9</version>
1414
</parent>
1515

1616
<properties>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>beer.devs</groupId>
4848
<artifactId>FastNbt-core</artifactId>
49-
<version>1.4.8</version>
49+
<version>1.4.9</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
</dependencies>

0 commit comments

Comments
 (0)