Skip to content

Commit b1af036

Browse files
authored
Add support for Minecraft 1.21.6 (#74)
1 parent a107eb2 commit b1af036

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Lightweight packet-based scoreboard API for Bukkit plugins, compatible with all
6060
<dependency>
6161
<groupId>fr.mrmicky</groupId>
6262
<artifactId>fastboard</artifactId>
63-
<version>2.1.4</version>
63+
<version>2.1.5</version>
6464
</dependency>
6565
</dependencies>
6666
```
@@ -80,7 +80,7 @@ repositories {
8080
}
8181
8282
dependencies {
83-
implementation 'fr.mrmicky:fastboard:2.1.4'
83+
implementation 'fr.mrmicky:fastboard:2.1.5'
8484
}
8585
8686
shadowJar {

pom.xml

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

77
<groupId>fr.mrmicky</groupId>
88
<artifactId>fastboard</artifactId>
9-
<version>2.1.4</version>
9+
<version>2.1.5</version>
1010

1111
<name>FastBoard</name>
1212
<description>Lightweight packet-based scoreboard API for Bukkit plugins.</description>

src/main/java/fr/mrmicky/fastboard/FastBoardBase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* The project is on <a href="https://github.com/MrMicky-FR/FastBoard">GitHub</a>.
4444
*
4545
* @author MrMicky
46-
* @version 2.1.4
46+
* @version 2.1.5
4747
*/
4848
public abstract class FastBoardBase<T> {
4949

@@ -165,7 +165,7 @@ public abstract class FastBoardBase<T> {
165165
PACKET_SB_SET_SCORE = packetSbSetScore;
166166
PACKET_SB_RESET_SCORE = packetSbResetScore;
167167
PACKET_SB_TEAM = FastReflection.findPacketConstructor(packetSbTeamClass, lookup);
168-
PACKET_SB_SERIALIZABLE_TEAM = sbTeamClass == null ? null : FastReflection.findPacketConstructor(sbTeamClass, lookup);
168+
PACKET_SB_SERIALIZABLE_TEAM = sbTeamClass != null ? FastReflection.findPacketConstructor(sbTeamClass, lookup) : null;
169169
FIXED_NUMBER_FORMAT = fixedFormatConstructor;
170170
BLANK_NUMBER_FORMAT = blankNumberFormat;
171171
SCORE_OPTIONAL_COMPONENTS = scoreOptionalComponents;
@@ -200,10 +200,10 @@ public abstract class FastBoardBase<T> {
200200
? "ScoreboardServer$Action"
201201
: "PacketPlayOutScoreboardScore$EnumScoreboardAction";
202202
ENUM_SB_HEALTH_DISPLAY = FastReflection.nmsClass("world.scores.criteria", "IScoreboardCriteria$EnumScoreboardHealthDisplay", "ObjectiveCriteria$RenderType");
203-
ENUM_SB_ACTION = FastReflection.nmsClass("server", enumSbActionClass, "ServerScoreboard$Method");
203+
ENUM_SB_ACTION = FastReflection.nmsOptionalClass("server", enumSbActionClass, "ServerScoreboard$Method").orElse(null);
204204
ENUM_SB_HEALTH_DISPLAY_INTEGER = FastReflection.enumValueOf(ENUM_SB_HEALTH_DISPLAY, "INTEGER", 0);
205-
ENUM_SB_ACTION_CHANGE = FastReflection.enumValueOf(ENUM_SB_ACTION, "CHANGE", 0);
206-
ENUM_SB_ACTION_REMOVE = FastReflection.enumValueOf(ENUM_SB_ACTION, "REMOVE", 1);
205+
ENUM_SB_ACTION_CHANGE = ENUM_SB_ACTION != null ? FastReflection.enumValueOf(ENUM_SB_ACTION, "CHANGE", 0) : null;
206+
ENUM_SB_ACTION_REMOVE = ENUM_SB_ACTION != null ? FastReflection.enumValueOf(ENUM_SB_ACTION, "REMOVE", 1) : null;
207207
} else {
208208
ENUM_SB_HEALTH_DISPLAY = null;
209209
ENUM_SB_ACTION = null;

src/main/java/fr/mrmicky/fastboard/FastReflection.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ public static Optional<Class<?>> nmsOptionalClass(String post1_17package, String
7979
return optionalClass(nmsClassName(post1_17package, className));
8080
}
8181

82+
public static Optional<Class<?>> nmsOptionalClass(String post1_17package, String spigotClass, String mojangClass) {
83+
return optionalClass(nmsClassName(post1_17package, MOJANG_MAPPINGS ? mojangClass : spigotClass));
84+
}
85+
8286
public static String obcClassName(String className) {
8387
return OBC_PACKAGE + '.' + className;
8488
}

0 commit comments

Comments
 (0)