Skip to content

Commit 839ba3c

Browse files
authored
Merge branch 'master' into ussage-of-score-as-update
2 parents 7a979f4 + 2095650 commit 839ba3c

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ public abstract class FastBoardBase<T> {
165165
scoreOptionalComponents = optionalScorePacket.isPresent();
166166
packetSbResetScore = lookup.findConstructor(resetScoreClass, removeScoreType);
167167
blankNumberFormat = blankField.isPresent() ? blankField.get().get(null) : null;
168+
} else if (VersionType.V1_17.isHigherOrEqual()) {
169+
Class<?> enumSbAction = FastReflection.nmsClass("server", "ScoreboardServer$Action", "ServerScoreboard$Method");
170+
MethodType scoreType = MethodType.methodType(void.class, enumSbAction, String.class, String.class, int.class);
171+
packetSbSetScore = lookup.findConstructor(packetSbScoreClass, scoreType);
172+
OBJECTIVE = lookup.unreflectConstructor(objectiveClass.getConstructor(scoreboardClass, String.class, objectiveCriteriaClass, CHAT_COMPONENT_CLASS, objectiveRenderTypeClass));
173+
PACKET_SB_OBJ = lookup.unreflectConstructor(packetSbObjClass.getConstructor(objectiveClass, int.class));
174+
PACKET_SB_DISPLAY_OBJ = lookup.unreflectConstructor(packetSbDisplayObjClass.getConstructor(displaySlotEnum.orElse(int.class), objectiveClass));
168175
} else {
169176
Constructor<?> packetSbTeamConstructor = sbTeamClass != null ? packetSbTeamClass.getDeclaredConstructor(String.class, int.class, Optional.class, Collection.class) : packetSbTeamClass.getDeclaredConstructor();
170177
packetSbTeamConstructor.setAccessible(true);

0 commit comments

Comments
 (0)