From 42fde12baae83426eddf42906af759ea388c9d23 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 1 Feb 2021 04:07:33 +1100 Subject: [PATCH] scoreboard stuff (#2000) --- mappings/net/minecraft/scoreboard/Scoreboard.mapping | 12 ++++++++++++ .../minecraft/scoreboard/ServerScoreboard.mapping | 3 +++ mappings/net/minecraft/scoreboard/Team.mapping | 1 + 3 files changed, 16 insertions(+) diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 3bd3746d3a..26cc370496 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -7,21 +7,26 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard FIELD field_1431 playerObjectives Ljava/util/Map; FIELD field_1432 objectiveSlots [Lnet/minecraft/class_266; METHOD method_1150 resetEntityScore (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_1151 getObjectives ()Ljava/util/Collection; METHOD method_1152 updatePlayerScore (Ljava/lang/String;)V ARG 1 playerName METHOD method_1153 getTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 name METHOD method_1154 updateScoreboardTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1155 resetPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 1 playerName ARG 2 objective METHOD method_1157 removePlayerFromTeam (Ljava/lang/String;Lnet/minecraft/class_268;)V ARG 1 playerName + ARG 2 team METHOD method_1158 setObjectiveSlot (ILnet/minecraft/class_266;)V ARG 1 slot ARG 2 objective METHOD method_1159 getTeams ()Ljava/util/Collection; METHOD method_1160 updateScoreboardTeamAndPlayers (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1161 (Lnet/minecraft/class_2499;Lnet/minecraft/class_267;)V ARG 1 score METHOD method_1162 forEachScore (Lnet/minecraft/class_274;Ljava/lang/String;Ljava/util/function/Consumer;)V @@ -30,6 +35,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 3 action METHOD method_1163 getObjectiveNames ()Ljava/util/Collection; METHOD method_1164 getPlayerTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 playerName METHOD method_1165 getObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1166 getPlayerObjectives (Ljava/lang/String;)Ljava/util/Map; @@ -44,8 +50,10 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard METHOD method_1170 getNullableObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1171 addTeam (Ljava/lang/String;)Lnet/minecraft/class_268; + ARG 1 name METHOD method_1172 addPlayerToTeam (Ljava/lang/String;Lnet/minecraft/class_268;)Z ARG 1 playerName + ARG 2 team METHOD method_1173 updateRemovedObjective (Lnet/minecraft/class_266;)V ARG 1 objective METHOD method_1175 updateExistingObjective (Lnet/minecraft/class_266;)V @@ -76,14 +84,18 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective METHOD method_1188 fromTag (Lnet/minecraft/class_2499;)V METHOD method_1189 getObjectiveForSlot (I)Lnet/minecraft/class_266; + ARG 1 slot METHOD method_1190 updatePlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V ARG 1 playerName ARG 2 objective METHOD method_1191 removeTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1192 getDisplaySlotId (Ljava/lang/String;)I ARG 0 slotName METHOD method_1193 updateRemovedTeam (Lnet/minecraft/class_268;)V + ARG 1 team METHOD method_1194 removeObjective (Lnet/minecraft/class_266;)V ARG 1 objective METHOD method_1195 clearPlayerTeam (Ljava/lang/String;)Z + ARG 1 playerName METHOD method_1196 getTeamNames ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 9b18cc07cd..36d74e972f 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -17,4 +17,7 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard METHOD method_12940 createRemovePackets (Lnet/minecraft/class_266;)Ljava/util/List; ARG 1 objective METHOD method_12941 runUpdateListeners ()V + METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; + ARG 1 nbt + METHOD method_32705 createState ()Lnet/minecraft/class_273; CLASS class_2996 UpdateMode diff --git a/mappings/net/minecraft/scoreboard/Team.mapping b/mappings/net/minecraft/scoreboard/Team.mapping index cb00a7c850..c0f4f80a6c 100644 --- a/mappings/net/minecraft/scoreboard/Team.mapping +++ b/mappings/net/minecraft/scoreboard/Team.mapping @@ -42,6 +42,7 @@ CLASS net/minecraft/class_268 net/minecraft/scoreboard/Team METHOD method_1145 setCollisionRule (Lnet/minecraft/class_270$class_271;)V ARG 1 collisionRule METHOD method_1146 setFriendlyFlagsBitwise (I)V + ARG 1 flags METHOD method_1147 getFriendlyFlagsBitwise ()I METHOD method_1148 getFormattedName ()Lnet/minecraft/class_5250; METHOD method_1149 setNameTagVisibilityRule (Lnet/minecraft/class_270$class_272;)V