Skip to content

Commit 3ad0471

Browse files
committed
1.4.10
- cleanup - 1.21.7 compatibility - revamped the project structure to avoid repeated code while still supporting Paper servers - updated readme to explain how to import the library on Paper servers
1 parent f7dee8b commit 3ad0471

File tree

41 files changed

+1518
-1074
lines changed

Some content is hidden

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

41 files changed

+1518
-1074
lines changed

.mvn-exec/GenerateNms.js

Lines changed: 0 additions & 100 deletions
This file was deleted.

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.9</version>
8+
<version>1.4.10</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010

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

1515
private static final String NMS_IMPL_PACKAGE = "beer.devs.fastnbt.nms.nbt.impl";
16-
private static final String NMS_IMPL_PACKAGE_SPIGOTMAP = "beer.devs.fastnbt.nms.nbt.impl_spigotmap";
17-
private static final String NMS_IMPL_PACKAGE_MOJANGMAP = "beer.devs.fastnbt.nms.nbt.impl_mojangmap";
1816

1917
public static boolean isPaper;
2018
private static final Map<Class<?>, Constructor<?>> CACHED_CONSTRUCTORS = new HashMap<>();
@@ -84,18 +82,7 @@ private static Class<?> getImplClass(Class<?> type) throws ClassNotFoundExceptio
8482
if(typeName.startsWith("I"))
8583
typeName = typeName.substring(1);
8684

87-
if(Version.isOlderThan(Version.v1_20_5))
88-
{
89-
classNamePath = NMS_IMPL_PACKAGE + "." + typeName + "_" + version.toString();
90-
}
91-
else
92-
{
93-
if (isSpigotMapped())
94-
classNamePath = NMS_IMPL_PACKAGE_SPIGOTMAP + "." + typeName + "_" + version.toString();
95-
else
96-
classNamePath = NMS_IMPL_PACKAGE_MOJANGMAP + "." + typeName + "_" + version.toString();
97-
}
98-
85+
classNamePath = NMS_IMPL_PACKAGE + "." + typeName + "_" + version.toString();
9986
return Class.forName(classNamePath);
10087
}
10188
catch (ClassNotFoundException e)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public enum Version
3131
v1_21_3(143, 768, "1.21.3"),
3232
v1_21_4(144, 769, "1.21.4"),
3333
v1_21_5(145, 770, "1.21.5"),
34-
v1_21_6(146, 771, "1.21.6")
34+
v1_21_6(146, 771, "1.21.6"),
35+
v1_21_7(147, 772, "1.21.7")
3536
;
3637

3738
private static Version version;

FastNbt-jar/pom.xml

Lines changed: 28 additions & 55 deletions
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.9</version>
8+
<version>1.4.10</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,14 +15,15 @@
1515

1616
<build>
1717
<plugins>
18-
<!-- To remove the manifest files-->
1918
<plugin>
2019
<groupId>org.apache.maven.plugins</groupId>
2120
<artifactId>maven-jar-plugin</artifactId>
2221
<version>3.2.0</version>
2322
<configuration>
2423
<archive>
25-
<addMavenDescriptor>false</addMavenDescriptor>
24+
<manifestEntries>
25+
<paperweight-mappings-namespace>spigot</paperweight-mappings-namespace>
26+
</manifestEntries>
2627
</archive>
2728
</configuration>
2829
</plugin>
@@ -53,116 +54,88 @@
5354
<dependency>
5455
<groupId>beer.devs</groupId>
5556
<artifactId>FastNbt-core</artifactId>
56-
<version>1.4.9</version>
57+
<version>1.4.10</version>
5758
</dependency>
5859

5960
<dependency>
6061
<groupId>beer.devs</groupId>
61-
<artifactId>fastnbt_nms_v1_21_6_mojangmap</artifactId>
62-
<version>1.4.9</version>
62+
<artifactId>fastnbt_nms_v1_21_7</artifactId>
63+
<version>1.4.10</version>
6364
</dependency>
6465
<dependency>
6566
<groupId>beer.devs</groupId>
66-
<artifactId>fastnbt_nms_v1_21_6_spigotmap</artifactId>
67-
<version>1.4.9</version>
68-
</dependency>
69-
70-
<dependency>
71-
<groupId>beer.devs</groupId>
72-
<artifactId>fastnbt_nms_v1_21_5_mojangmap</artifactId>
73-
<version>1.4.9</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>beer.devs</groupId>
77-
<artifactId>fastnbt_nms_v1_21_5_spigotmap</artifactId>
78-
<version>1.4.9</version>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>beer.devs</groupId>
83-
<artifactId>fastnbt_nms_v1_21_4_mojangmap</artifactId>
84-
<version>1.4.9</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>beer.devs</groupId>
88-
<artifactId>fastnbt_nms_v1_21_4_spigotmap</artifactId>
89-
<version>1.4.9</version>
67+
<artifactId>fastnbt_nms_v1_21_6</artifactId>
68+
<version>1.4.10</version>
9069
</dependency>
9170
<dependency>
9271
<groupId>beer.devs</groupId>
93-
<artifactId>fastnbt_nms_v1_21_3_mojangmap</artifactId>
94-
<version>1.4.9</version>
72+
<artifactId>fastnbt_nms_v1_21_5</artifactId>
73+
<version>1.4.10</version>
9574
</dependency>
9675
<dependency>
9776
<groupId>beer.devs</groupId>
98-
<artifactId>fastnbt_nms_v1_21_3_spigotmap</artifactId>
99-
<version>1.4.9</version>
77+
<artifactId>fastnbt_nms_v1_21_4</artifactId>
78+
<version>1.4.10</version>
10079
</dependency>
10180
<dependency>
10281
<groupId>beer.devs</groupId>
103-
<artifactId>fastnbt_nms_v1_21_1_mojangmap</artifactId>
104-
<version>1.4.9</version>
82+
<artifactId>fastnbt_nms_v1_21_3</artifactId>
83+
<version>1.4.10</version>
10584
</dependency>
10685
<dependency>
10786
<groupId>beer.devs</groupId>
108-
<artifactId>fastnbt_nms_v1_21_1_spigotmap</artifactId>
109-
<version>1.4.9</version>
87+
<artifactId>fastnbt_nms_v1_21_1</artifactId>
88+
<version>1.4.10</version>
11089
</dependency>
11190
<dependency>
11291
<groupId>beer.devs</groupId>
113-
<artifactId>fastnbt_nms_v1_20_6_mojangmap</artifactId>
114-
<version>1.4.9</version>
92+
<artifactId>fastnbt_nms_v1_20_6</artifactId>
93+
<version>1.4.10</version>
11594
</dependency>
116-
<dependency>
117-
<groupId>beer.devs</groupId>
118-
<artifactId>fastnbt_nms_v1_20_6_spigotmap</artifactId>
119-
<version>1.4.9</version>
120-
</dependency>
121-
12295
<dependency>
12396
<groupId>beer.devs</groupId>
12497
<artifactId>fastnbt_nms_v1_20_4</artifactId>
125-
<version>1.4.9</version>
98+
<version>1.4.10</version>
12699
</dependency>
127100
<dependency>
128101
<groupId>beer.devs</groupId>
129102
<artifactId>fastnbt_nms_v1_20_R3</artifactId>
130-
<version>1.4.9</version>
103+
<version>1.4.10</version>
131104
</dependency>
132105
<dependency>
133106
<groupId>beer.devs</groupId>
134107
<artifactId>fastnbt_nms_v1_20_R2</artifactId>
135-
<version>1.4.9</version>
108+
<version>1.4.10</version>
136109
</dependency>
137110
<dependency>
138111
<groupId>beer.devs</groupId>
139112
<artifactId>fastnbt_nms_v1_20_R1</artifactId>
140-
<version>1.4.9</version>
113+
<version>1.4.10</version>
141114
</dependency>
142115
<dependency>
143116
<groupId>beer.devs</groupId>
144117
<artifactId>fastnbt_nms_v1_19_R3</artifactId>
145-
<version>1.4.9</version>
118+
<version>1.4.10</version>
146119
</dependency>
147120
<dependency>
148121
<groupId>beer.devs</groupId>
149122
<artifactId>fastnbt_nms_v1_19_R2</artifactId>
150-
<version>1.4.9</version>
123+
<version>1.4.10</version>
151124
</dependency>
152125
<dependency>
153126
<groupId>beer.devs</groupId>
154127
<artifactId>fastnbt_nms_v1_19_R1</artifactId>
155-
<version>1.4.9</version>
128+
<version>1.4.10</version>
156129
</dependency>
157130
<dependency>
158131
<groupId>beer.devs</groupId>
159132
<artifactId>fastnbt_nms_v1_18_R2</artifactId>
160-
<version>1.4.9</version>
133+
<version>1.4.10</version>
161134
</dependency>
162135
<dependency>
163136
<groupId>beer.devs</groupId>
164137
<artifactId>fastnbt_nms_v1_17_R1</artifactId>
165-
<version>1.4.9</version>
138+
<version>1.4.10</version>
166139
</dependency>
167140
</dependencies>
168141

0 commit comments

Comments
 (0)