Skip to content

Commit

Permalink
fix mappings name conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@moehreag
moehreag committed Dec 6, 2023
1 parent 5fc3265 commit 4e10ed4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/inventory/RecipeInputInventory.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/unmapped/C_fcvwjvlq net/minecraft/inventory/RecipeInputInventory
METHOD m_dvbyvcly getHeight ()I
METHOD m_mmnfalel getIngredients ()Ljava/util/List;
METHOD m_mmnfalel getInvStack ()Ljava/util/List;
METHOD m_rkeovwln getWidth ()I
9 changes: 9 additions & 0 deletions mappings/net/minecraft/scoreboard/ScoreHolder.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLASS net/minecraft/unmapped/C_hswmfudr net/minecraft/scoreboard/ScoreHolder
FIELD f_jypjdiho WILDCARD_NAME Ljava/lang/String;
FIELD f_pmpdsbtk WILDCARD Lnet/minecraft/unmapped/C_hswmfudr;
METHOD m_hctfxpqq getNameWithEffects ()Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_hyhtasei getDisplayName ()Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_kcquvkhk getProfileName ()Ljava/lang/String;
METHOD m_sjxsoice of (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/unmapped/C_hswmfudr;
METHOD m_slkxlpjb of (Ljava/lang/String;)Lnet/minecraft/unmapped/C_hswmfudr;
ARG 0 name

2 comments on commit 4e10ed4

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 4e10ed4, 31 file(s) were updated with 163 line(s) added and 160 removed compared to the latest Quilt Mappings version.

View the diff here (1/2): 
diff -bur namedTargetSrc/net/minecraft/block/Crafter.java namedSrc/net/minecraft/block/Crafter.java
--- namedTargetSrc/net/minecraft/block/Crafter.java	2023-12-06 20:06:43.837275414 +0000
+++ namedSrc/net/minecraft/block/Crafter.java	2023-12-06 20:05:40.876282631 +0000
@@ -240,7 +240,7 @@
             lv4.onCraft(world);
             this.m_wbzysgew(world, pos, lv, lv4, state);
             lv3.getRemainder(lv).forEach(stack -> this.m_wbzysgew(world, pos, lv, stack, state));
-            lv.getIngredients().forEach(stack -> {
+            lv.getInvStack().forEach(stack -> {
                if (!stack.isEmpty()) {
                   stack.decrement(1);
                }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2023-12-06 20:06:43.877276049 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2023-12-06 20:05:40.924283388 +0000
@@ -641,7 +641,7 @@
          this.subtitlesHud.render(graphics);
          Scoreboard lv5 = this.client.world.getScoreboard();
          ScoreboardObjective lv6 = null;
-         Team lv7 = lv5.getPlayerTeam(this.client.player.m_kcquvkhk());
+         Team lv7 = lv5.getPlayerTeam(this.client.player.getProfileName());
          if (lv7 != null) {
             ScoreboardDisplaySlot lv8 = ScoreboardDisplaySlot.fromFormatting(lv7.getColor());
             if (lv8 != null) {
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-12-06 20:06:43.773274396 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-12-06 20:05:40.788281244 +0000
@@ -20,6 +20,7 @@
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerModelPart;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardCriterion;
 import net.minecraft.scoreboard.ScoreboardObjective;
@@ -29,7 +30,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
 import net.minecraft.unmapped.C_ctcbtkhc;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_vgsaeqvm;
 import net.minecraft.unmapped.C_zhwspcux;
 import net.minecraft.util.Formatting;
@@ -226,7 +226,7 @@
          Text lv3 = null;
          int n = 0;
          if (objective != null) {
-            C_hswmfudr lv4 = C_hswmfudr.m_sjxsoice(lv.getProfile());
+            ScoreHolder lv4 = ScoreHolder.of(lv.getProfile());
             C_vgsaeqvm lv5 = scoreboard.m_ntnuhjcd(lv4, objective);
             if (lv5 != null) {
                m = lv5.m_lpdvqurp();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-12-06 20:06:43.825275222 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-12-06 20:05:40.848282191 +0000
@@ -740,7 +740,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-12-06 20:06:44.009278148 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-12-06 20:05:41.072285722 +0000
@@ -336,13 +336,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.active
          && this.visible
-         && d >= (double)this.getX()
-         && e >= (double)this.getY()
-         && d < (double)(this.getX() + this.width)
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseY >= (double)this.getY()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-06 20:06:43.805274905 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-06 20:05:40.828281874 +0000
@@ -596,8 +596,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
-      return e >= (double)this.getY() && e <= (double)this.m_tovfilfx() && d >= (double)this.getX() && d <= (double)this.m_cgsapias();
+   public boolean isMouseOver(double mouseX, double mouseY) {
+      return mouseY >= (double)this.getY() && mouseY <= (double)this.m_tovfilfx() && mouseX >= (double)this.getX() && mouseX <= (double)this.m_cgsapias();
    }
 
    /**
@@ -862,8 +862,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double d, double e) {
-         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
+      public boolean isMouseOver(double mouseX, double mouseY) {
+         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-06 20:06:43.889276240 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-06 20:05:40.936283578 +0000
@@ -242,7 +242,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-12-06 20:06:44.013278211 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-12-06 20:05:41.076285784 +0000
@@ -637,7 +637,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-12-06 20:06:43.825275222 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-12-06 20:05:40.848282191 +0000
@@ -729,12 +729,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.visible
-         && d >= (double)this.getX()
-         && d < (double)(this.getX() + this.width)
-         && e >= (double)this.getY()
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY >= (double)this.getY()
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-12-06 20:06:44.025278402 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-12-06 20:05:41.096286101 +0000
@@ -263,6 +263,7 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.scoreboard.AbstractTeam;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardCriterion;
 import net.minecraft.scoreboard.ScoreboardObjective;
@@ -279,7 +280,6 @@
 import net.minecraft.unmapped.C_ctudssai;
 import net.minecraft.unmapped.C_cwhcssbd;
 import net.minecraft.unmapped.C_hgofpcxx;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_lyxndgop;
 import net.minecraft.unmapped.C_phmnykiz;
 import net.minecraft.unmapped.C_qoryhtax;
@@ -2407,7 +2407,7 @@
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       Scoreboard lv = this.world.getScoreboard();
       String string = packet.objectiveName();
-      C_hswmfudr lv2 = C_hswmfudr.m_slkxlpjb(packet.owner());
+      ScoreHolder lv2 = ScoreHolder.of(packet.owner());
       ScoreboardObjective lv3 = lv.getNullableObjective(string);
       if (lv3 != null) {
          C_qwlnyyss lv4 = lv.m_gzrrjdmh(lv2, lv3, true);
@@ -2427,7 +2427,7 @@
       NetworkThreadUtils.forceMainThread(arg, this, this.client);
       Scoreboard lv = this.world.getScoreboard();
       String string = arg.objectiveName();
-      C_hswmfudr lv2 = C_hswmfudr.m_slkxlpjb(arg.owner());
+      ScoreHolder lv2 = ScoreHolder.of(arg.owner());
       if (string == null) {
          lv.m_ehrhtdjk(lv2);
       } else {
diff -bur namedTargetSrc/net/minecraft/command/argument/ScoreHolderArgumentType.java namedSrc/net/minecraft/command/argument/ScoreHolderArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ScoreHolderArgumentType.java	2023-12-06 20:06:43.945277130 +0000
+++ namedSrc/net/minecraft/command/argument/ScoreHolderArgumentType.java	2023-12-06 20:05:41.004284650 +0000
@@ -25,7 +25,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hswmfudr;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_jtheqbzk}
@@ -76,10 +75,10 @@
 
    /**
     * @mapping {@literal hashed m_auogzbmx Lnet/minecraft/unmapped/C_jtheqbzk;m_auogzbmx(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_hswmfudr;}
-    * @mapping {@literal named getScoreHolder Lnet/minecraft/command/argument/ScoreHolderArgumentType;getScoreHolder(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_hswmfudr;}
+    * @mapping {@literal named getScoreHolder Lnet/minecraft/command/argument/ScoreHolderArgumentType;getScoreHolder(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/scoreboard/ScoreHolder;}
     */
-   public static C_hswmfudr getScoreHolder(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
-      return (C_hswmfudr)getScoreHolders(context, name).iterator().next();
+   public static net.minecraft.scoreboard.ScoreHolder getScoreHolder(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
+      return (net.minecraft.scoreboard.ScoreHolder)getScoreHolders(context, name).iterator().next();
    }
 
    /**
@@ -94,7 +93,7 @@
     * @mapping {@literal hashed m_imaxcwoj Lnet/minecraft/unmapped/C_jtheqbzk;m_imaxcwoj(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;}
     * @mapping {@literal named getScoreHolders Lnet/minecraft/command/argument/ScoreHolderArgumentType;getScoreHolders(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;}
     */
-   public static Collection<C_hswmfudr> getScoreHolders(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
+   public static Collection<net.minecraft.scoreboard.ScoreHolder> getScoreHolders(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
       return getScoreHolders(context, name, Collections::emptyList);
    }
 
@@ -109,7 +108,7 @@
     * @mapping {@literal hashed m_xnumnlaa Lnet/minecraft/unmapped/C_jtheqbzk;m_xnumnlaa(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;}
     * @mapping {@literal named getScoreHoldersWithGlobalWildcard Lnet/minecraft/command/argument/ScoreHolderArgumentType;getScoreHoldersWithGlobalWildcard(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;}
     */
-   public static Collection<C_hswmfudr> getScoreHoldersWithGlobalWildcard(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
+   public static Collection<net.minecraft.scoreboard.ScoreHolder> getScoreHoldersWithGlobalWildcard(CommandContext<ServerCommandSource> context, String name) throws CommandSyntaxException {
       return getScoreHolders(context, name, context.getSource().getServer().getScoreboard()::getKnownPlayers);
    }
 
@@ -125,10 +124,12 @@
     * @mapping {@literal hashed m_qvsvyhiv Lnet/minecraft/unmapped/C_jtheqbzk;m_qvsvyhiv(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/Collection;}
     * @mapping {@literal named getScoreHolders Lnet/minecraft/command/argument/ScoreHolderArgumentType;getScoreHolders(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/Collection;}
     */
-   public static Collection<C_hswmfudr> getScoreHolders(
-      CommandContext<ServerCommandSource> context, String name, Supplier<Collection<C_hswmfudr>> wildcardValue
+   public static Collection<net.minecraft.scoreboard.ScoreHolder> getScoreHolders(
+      CommandContext<ServerCommandSource> context, String name, Supplier<Collection<net.minecraft.scoreboard.ScoreHolder>> wildcardValue
    ) throws CommandSyntaxException {
-      Collection<C_hswmfudr> collection = context.<ScoreHolderArgumentType.ScoreHolder>getArgument(name, ScoreHolderArgumentType.ScoreHolder.class)
+      Collection<net.minecraft.scoreboard.ScoreHolder> collection = context.<ScoreHolderArgumentType.ScoreHolder>getArgument(
+            name, ScoreHolderArgumentType.ScoreHolder.class
+         )
          .getNames(context.getSource(), wildcardValue);
       if (collection.isEmpty()) {
          throw EntityArgumentType.ENTITY_NOT_FOUND_EXCEPTION.create();
@@ -176,7 +177,7 @@
          String string = stringReader.getString().substring(i, stringReader.getCursor());
          if (string.equals("*")) {
             return (source, strings) -> {
-               Collection<C_hswmfudr> collection = (Collection)strings.get();
+               Collection<net.minecraft.scoreboard.ScoreHolder> collection = (Collection)strings.get();
                if (collection.isEmpty()) {
                   throw EMPTY_SCORE_HOLDER_EXCEPTION.create();
                } else {
@@ -184,7 +185,7 @@
                }
             };
          } else if (string.startsWith("#")) {
-            List<C_hswmfudr> list = List.of(C_hswmfudr.m_slkxlpjb(string));
+            List<net.minecraft.scoreboard.ScoreHolder> list = List.of(net.minecraft.scoreboard.ScoreHolder.of(string));
             return (source, strings) -> list;
          } else {
             return (arg, supplier) -> {
@@ -195,7 +196,7 @@
                } else {
                   try {
                      UUID uUID = UUID.fromString(string);
-                     List<C_hswmfudr> listx = new ArrayList();
+                     List<net.minecraft.scoreboard.ScoreHolder> listx = new ArrayList();
 
                      for (ServerWorld lv2 : minecraftServer.getWorlds()) {
                         Entity lv3 = lv2.getEntity(uUID);
@@ -210,7 +211,7 @@
                   } catch (IllegalArgumentException var10) {
                   }
 
-                  return List.of(C_hswmfudr.m_slkxlpjb(string));
+                  return List.of(net.minecraft.scoreboard.ScoreHolder.of(string));
                }
             };
          }
@@ -323,7 +324,7 @@
        * @mapping {@literal hashed getNames Lnet/minecraft/unmapped/C_jtheqbzk$C_keizypyt;getNames(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/function/Supplier;)Ljava/util/Collection;}
        * @mapping {@literal named getNames Lnet/minecraft/command/argument/ScoreHolderArgumentType$ScoreHolder;getNames(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/function/Supplier;)Ljava/util/Collection;}
        */
-      Collection<C_hswmfudr> getNames(ServerCommandSource source, Supplier<Collection<C_hswmfudr>> strings) throws CommandSyntaxException;
+      Collection<net.minecraft.scoreboard.ScoreHolder> getNames(ServerCommandSource source, Supplier<Collection<net.minecraft.scoreboard.ScoreHolder>> strings) throws CommandSyntaxException;
    }
 
    /**
@@ -349,7 +350,9 @@
        * Mapping not found
        */
       @Override
-      public Collection<C_hswmfudr> getNames(ServerCommandSource arg, Supplier<Collection<C_hswmfudr>> supplier) throws CommandSyntaxException {
+      public Collection<net.minecraft.scoreboard.ScoreHolder> getNames(
+         ServerCommandSource arg, Supplier<Collection<net.minecraft.scoreboard.ScoreHolder>> supplier
+      ) throws CommandSyntaxException {
          List<? extends Entity> list = this.selector.getEntities(arg);
          if (list.isEmpty()) {
             throw EntityArgumentType.ENTITY_NOT_FOUND_EXCEPTION.create();
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2023-12-06 20:06:43.977277639 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2023-12-06 20:05:41.032285091 +0000
@@ -64,6 +64,7 @@
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.scoreboard.AbstractTeam;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
@@ -79,7 +80,6 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.BlockMirror;
@@ -132,7 +132,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_astfners}
  * @mapping {@literal named net/minecraft/entity/Entity}
  */
-public abstract class Entity implements Nameable, EntityLike, CommandOutput, C_hswmfudr {
+public abstract class Entity implements Nameable, EntityLike, CommandOutput, ScoreHolder {
    /**
     * @mapping {@literal hashed f_ssljujsr Lnet/minecraft/unmapped/C_astfners;f_ssljujsr:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/entity/Entity;LOGGER:Lorg/slf4j/Logger;}
@@ -3762,7 +3762,7 @@
     */
    @Nullable
    public Team getScoreboardTeam() {
-      return this.getWorld().getScoreboard().getPlayerTeam(this.m_kcquvkhk());
+      return this.getWorld().getScoreboard().getPlayerTeam(this.getProfileName());
    }
 
    /**
@@ -4370,7 +4370,7 @@
     * Mapping not found
     */
    @Override
-   public String m_kcquvkhk() {
+   public String getProfileName() {
       return this.uuidString;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java namedSrc/net/minecraft/entity/mob/EvokerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EvokerEntity.java	2023-12-06 20:06:43.917276685 +0000
+++ namedSrc/net/minecraft/entity/mob/EvokerEntity.java	2023-12-06 20:05:40.968284082 +0000
@@ -395,7 +395,7 @@
                lv4.setBounds(lv3);
                lv4.setLifeTicks(20 * (30 + EvokerEntity.this.random.nextInt(90)));
                if (lv2 != null) {
-                  lv.getScoreboard().addPlayerToTeam(lv4.m_kcquvkhk(), lv2);
+                  lv.getScoreboard().addPlayerToTeam(lv4.getProfileName(), lv2);
                }
 
                lv.spawnEntityAndPassengers(lv4);
diff -bur namedTargetSrc/net/minecraft/entity/player/PlayerEntity.java namedSrc/net/minecraft/entity/player/PlayerEntity.java
--- namedTargetSrc/net/minecraft/entity/player/PlayerEntity.java	2023-12-06 20:06:44.001278020 +0000
+++ namedSrc/net/minecraft/entity/player/PlayerEntity.java	2023-12-06 20:05:41.060285532 +0000
@@ -2629,7 +2629,7 @@
     * Mapping not found
     */
    @Override
-   public String m_kcquvkhk() {
+   public String getProfileName() {
       return this.getGameProfile().getName();
    }
 
diff -bur namedTargetSrc/net/minecraft/inventory/CraftingInventory.java namedSrc/net/minecraft/inventory/CraftingInventory.java
--- namedTargetSrc/net/minecraft/inventory/CraftingInventory.java	2023-12-06 20:06:44.045278720 +0000
+++ namedSrc/net/minecraft/inventory/CraftingInventory.java	2023-12-06 20:05:41.124286541 +0000
@@ -155,7 +155,7 @@
     * Mapping not found
     */
    @Override
-   public List<ItemStack> getIngredients() {
+   public List<ItemStack> getInvStack() {
       return List.copyOf(this.stacks);
    }
 
diff -bur namedTargetSrc/net/minecraft/inventory/RecipeInputInventory.java namedSrc/net/minecraft/inventory/RecipeInputInventory.java
--- namedTargetSrc/net/minecraft/inventory/RecipeInputInventory.java	2023-12-06 20:06:43.985277766 +0000
+++ namedSrc/net/minecraft/inventory/RecipeInputInventory.java	2023-12-06 20:05:41.044285280 +0000
@@ -23,7 +23,7 @@
 
    /**
     * @mapping {@literal hashed m_mmnfalel Lnet/minecraft/unmapped/C_fcvwjvlq;m_mmnfalel()Ljava/util/List;}
-    * @mapping {@literal named getIngredients Lnet/minecraft/inventory/RecipeInputInventory;getIngredients()Ljava/util/List;}
+    * @mapping {@literal named getInvStack Lnet/minecraft/inventory/RecipeInputInventory;getInvStack()Ljava/util/List;}
     */
-   List<ItemStack> getIngredients();
+   List<ItemStack> getInvStack();
 }
diff -bur namedTargetSrc/net/minecraft/loot/provider/number/ScoreLootNumberProvider.java namedSrc/net/minecraft/loot/provider/number/ScoreLootNumberProvider.java
--- namedTargetSrc/net/minecraft/loot/provider/number/ScoreLootNumberProvider.java	2023-12-06 20:06:44.033278529 +0000
+++ namedSrc/net/minecraft/loot/provider/number/ScoreLootNumberProvider.java	2023-12-06 20:05:41.104286226 +0000
@@ -8,9 +8,9 @@
 import net.minecraft.loot.provider.score.ContextLootScoreProvider;
 import net.minecraft.loot.provider.score.LootScoreProvider;
 import net.minecraft.loot.provider.score.LootScoreProviderTypes;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_vgsaeqvm;
 
 /**
@@ -68,7 +68,7 @@
     */
    @Override
    public float nextFloat(LootContext context) {
-      C_hswmfudr lv = this.target.m_snzluimt(context);
+      ScoreHolder lv = this.target.m_snzluimt(context);
       if (lv == null) {
          return 0.0F;
       } else {
diff -bur namedTargetSrc/net/minecraft/loot/provider/score/ContextLootScoreProvider.java namedSrc/net/minecraft/loot/provider/score/ContextLootScoreProvider.java
--- namedTargetSrc/net/minecraft/loot/provider/score/ContextLootScoreProvider.java	2023-12-06 20:06:43.893276304 +0000
+++ namedSrc/net/minecraft/loot/provider/score/ContextLootScoreProvider.java	2023-12-06 20:05:40.940283640 +0000
@@ -6,7 +6,7 @@
 import java.util.Set;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.context.LootContextParameter;
-import net.minecraft.unmapped.C_hswmfudr;
+import net.minecraft.scoreboard.ScoreHolder;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -48,7 +48,7 @@
     */
    @Nullable
    @Override
-   public C_hswmfudr m_snzluimt(LootContext arg) {
+   public ScoreHolder m_snzluimt(LootContext arg) {
       return arg.get(this.target.getParameter());
    }
 
diff -bur namedTargetSrc/net/minecraft/loot/provider/score/FixedLootScoreProvider.java namedSrc/net/minecraft/loot/provider/score/FixedLootScoreProvider.java
--- namedTargetSrc/net/minecraft/loot/provider/score/FixedLootScoreProvider.java	2023-12-06 20:06:43.885276176 +0000
+++ namedSrc/net/minecraft/loot/provider/score/FixedLootScoreProvider.java	2023-12-06 20:05:40.932283514 +0000
@@ -6,7 +6,7 @@
 import java.util.Set;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.context.LootContextParameter;
-import net.minecraft.unmapped.C_hswmfudr;
+import net.minecraft.scoreboard.ScoreHolder;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vboykgbo}
@@ -41,8 +41,8 @@
     * Mapping not found
     */
    @Override
-   public C_hswmfudr m_snzluimt(LootContext arg) {
-      return C_hswmfudr.m_slkxlpjb(this.name);
+   public ScoreHolder m_snzluimt(LootContext arg) {
+      return ScoreHolder.of(this.name);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/loot/provider/score/LootScoreProvider.java namedSrc/net/minecraft/loot/provider/score/LootScoreProvider.java
--- namedTargetSrc/net/minecraft/loot/provider/score/LootScoreProvider.java	2023-12-06 20:06:44.045278720 +0000
+++ namedSrc/net/minecraft/loot/provider/score/LootScoreProvider.java	2023-12-06 20:05:41.124286541 +0000
@@ -3,7 +3,7 @@
 import java.util.Set;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.context.LootContextParameter;
-import net.minecraft.unmapped.C_hswmfudr;
+import net.minecraft.scoreboard.ScoreHolder;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -15,7 +15,7 @@
     * Mapping not found
     */
    @Nullable
-   C_hswmfudr m_snzluimt(LootContext arg);
+   ScoreHolder m_snzluimt(LootContext arg);
 
    /**
     * @mapping {@literal hashed m_mwbmaeyv Lnet/minecraft/unmapped/C_bvhqzshp;m_mwbmaeyv()Lnet/minecraft/unmapped/C_bocpfiym;}
diff -bur namedTargetSrc/net/minecraft/scoreboard/Scoreboard.java namedSrc/net/minecraft/scoreboard/Scoreboard.java
--- namedTargetSrc/net/minecraft/scoreboard/Scoreboard.java	2023-12-06 20:06:43.789274650 +0000
+++ namedSrc/net/minecraft/scoreboard/Scoreboard.java	2023-12-06 20:05:40.808281559 +0000
@@ -18,7 +18,6 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_kqjthpfy;
 import net.minecraft.unmapped.C_lfemghur;
 import net.minecraft.unmapped.C_qwlnyyss;
@@ -102,9 +101,9 @@
 
    /**
     * @mapping {@literal hashed m_cfzvdwxh Lnet/minecraft/unmapped/C_ymwyplge;m_cfzvdwxh(Lnet/minecraft/unmapped/C_adsgsrpw;Lnet/minecraft/unmapped/C_hswmfudr;Ljava/util/function/Consumer;)V}
-    * @mapping {@literal named forEachScore Lnet/minecraft/scoreboard/Scoreboard;forEachScore(Lnet/minecraft/scoreboard/ScoreboardCriterion;Lnet/minecraft/unmapped/C_hswmfudr;Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named forEachScore Lnet/minecraft/scoreboard/Scoreboard;forEachScore(Lnet/minecraft/scoreboard/ScoreboardCriterion;Lnet/minecraft/scoreboard/ScoreHolder;Ljava/util/function/Consumer;)V}
     */
-   public final void forEachScore(ScoreboardCriterion criterion, C_hswmfudr arg2, Consumer<C_qwlnyyss> action) {
+   public final void forEachScore(ScoreboardCriterion criterion, ScoreHolder arg2, Consumer<C_qwlnyyss> action) {
       ((List)this.objectivesByCriterion.getOrDefault(criterion, Collections.emptyList()))
          .forEach(objective -> action.accept(this.m_gzrrjdmh(arg2, objective, true)));
    }
@@ -119,16 +118,16 @@
    /**
     * Mapping not found
     */
-   public C_qwlnyyss m_jhiwvwxm(C_hswmfudr arg, ScoreboardObjective arg2) {
+   public C_qwlnyyss m_jhiwvwxm(ScoreHolder arg, ScoreboardObjective arg2) {
       return this.m_gzrrjdmh(arg, arg2, false);
    }
 
    /**
     * Mapping not found
     */
-   public C_qwlnyyss m_gzrrjdmh(C_hswmfudr arg, ScoreboardObjective arg2, boolean bl) {
+   public C_qwlnyyss m_gzrrjdmh(ScoreHolder arg, ScoreboardObjective arg2, boolean bl) {
       final boolean bl2 = bl || !arg2.getCriterion().isReadOnly();
-      C_kqjthpfy lv = this.m_xuunviiw(arg.m_kcquvkhk());
+      C_kqjthpfy lv = this.m_xuunviiw(arg.getProfileName());
       final MutableBoolean mutableBoolean = new MutableBoolean();
       final ScoreboardPlayerScore lv2 = lv.m_zynrzgzq(arg2, argx -> mutableBoolean.setTrue());
       return new C_qwlnyyss() {
@@ -247,8 +246,8 @@
     * Mapping not found
     */
    @Nullable
-   public C_vgsaeqvm m_ntnuhjcd(C_hswmfudr arg, ScoreboardObjective arg2) {
-      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.m_kcquvkhk());
+   public C_vgsaeqvm m_ntnuhjcd(ScoreHolder arg, ScoreboardObjective arg2) {
+      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.getProfileName());
       return lv != null ? lv.m_tmxzvdes(arg2) : null;
    }
 
@@ -286,15 +285,15 @@
     * @mapping {@literal hashed m_sfhwfwqj Lnet/minecraft/unmapped/C_ymwyplge;m_sfhwfwqj()Ljava/util/Collection;}
     * @mapping {@literal named getKnownPlayers Lnet/minecraft/scoreboard/Scoreboard;getKnownPlayers()Ljava/util/Collection;}
     */
-   public Collection<C_hswmfudr> getKnownPlayers() {
-      return this.playerObjectives.keySet().stream().map(C_hswmfudr::m_slkxlpjb).toList();
+   public Collection<ScoreHolder> getKnownPlayers() {
+      return this.playerObjectives.keySet().stream().map(ScoreHolder::of).toList();
    }
 
    /**
     * Mapping not found
     */
-   public void m_ehrhtdjk(C_hswmfudr arg) {
-      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.remove(arg.m_kcquvkhk());
+   public void m_ehrhtdjk(ScoreHolder arg) {
+      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.remove(arg.getProfileName());
       if (lv != null) {
          this.updatePlayerScore(arg);
       }
@@ -303,12 +302,12 @@
    /**
     * Mapping not found
     */
-   public void m_hudewirl(C_hswmfudr arg, ScoreboardObjective arg2) {
-      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.m_kcquvkhk());
+   public void m_hudewirl(ScoreHolder arg, ScoreboardObjective arg2) {
+      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.getProfileName());
       if (lv != null) {
          boolean bl = lv.m_vmbhsvwu(arg2);
          if (!lv.m_qrmysndo()) {
-            C_kqjthpfy lv2 = (C_kqjthpfy)this.playerObjectives.remove(arg.m_kcquvkhk());
+            C_kqjthpfy lv2 = (C_kqjthpfy)this.playerObjectives.remove(arg.getProfileName());
             if (lv2 != null) {
                this.updatePlayerScore(arg);
             }
@@ -321,8 +320,8 @@
    /**
     * Mapping not found
     */
-   public Object2IntMap<ScoreboardObjective> m_wltptshg(C_hswmfudr arg) {
-      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.m_kcquvkhk());
+   public Object2IntMap<ScoreboardObjective> m_wltptshg(ScoreHolder arg) {
+      C_kqjthpfy lv = (C_kqjthpfy)this.playerObjectives.get(arg.getProfileName());
       return lv != null ? lv.m_azbyusoc() : Object2IntMaps.emptyMap();
    }
 
@@ -496,29 +495,29 @@
 
    /**
     * @mapping {@literal hashed m_fcpprjwp Lnet/minecraft/unmapped/C_ymwyplge;m_fcpprjwp(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_tlhwodcf;Lnet/minecraft/unmapped/C_jmgxjonl;)V}
-    * @mapping {@literal named updateScore Lnet/minecraft/scoreboard/Scoreboard;updateScore(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/scoreboard/ScoreboardObjective;Lnet/minecraft/scoreboard/ScoreboardPlayerScore;)V}
+    * @mapping {@literal named updateScore Lnet/minecraft/scoreboard/Scoreboard;updateScore(Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/scoreboard/ScoreboardObjective;Lnet/minecraft/scoreboard/ScoreboardPlayerScore;)V}
     */
-   protected void updateScore(C_hswmfudr arg, ScoreboardObjective arg2, ScoreboardPlayerScore score) {
+   protected void updateScore(ScoreHolder arg, ScoreboardObjective arg2, ScoreboardPlayerScore score) {
    }
 
    /**
     * Mapping not found
     */
-   protected void m_gmemzclj(C_hswmfudr arg, ScoreboardObjective arg2) {
+   protected void m_gmemzclj(ScoreHolder arg, ScoreboardObjective arg2) {
    }
 
    /**
     * @mapping {@literal hashed m_obtwmusn Lnet/minecraft/unmapped/C_ymwyplge;m_obtwmusn(Lnet/minecraft/unmapped/C_hswmfudr;)V}
-    * @mapping {@literal named updatePlayerScore Lnet/minecraft/scoreboard/Scoreboard;updatePlayerScore(Lnet/minecraft/unmapped/C_hswmfudr;)V}
+    * @mapping {@literal named updatePlayerScore Lnet/minecraft/scoreboard/Scoreboard;updatePlayerScore(Lnet/minecraft/scoreboard/ScoreHolder;)V}
     */
-   public void updatePlayerScore(C_hswmfudr arg) {
+   public void updatePlayerScore(ScoreHolder arg) {
    }
 
    /**
     * @mapping {@literal hashed m_pmtoubwo Lnet/minecraft/unmapped/C_ymwyplge;m_pmtoubwo(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_tlhwodcf;)V}
-    * @mapping {@literal named updatePlayerScore Lnet/minecraft/scoreboard/Scoreboard;updatePlayerScore(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/scoreboard/ScoreboardObjective;)V}
+    * @mapping {@literal named updatePlayerScore Lnet/minecraft/scoreboard/Scoreboard;updatePlayerScore(Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/scoreboard/ScoreboardObjective;)V}
     */
-   public void updatePlayerScore(C_hswmfudr arg, ScoreboardObjective objective) {
+   public void updatePlayerScore(ScoreHolder arg, ScoreboardObjective objective) {
    }
 
    /**
@@ -549,7 +548,7 @@
    public void resetEntityScore(Entity entity) {
       if (!(entity instanceof PlayerEntity) && !entity.isAlive()) {
          this.m_ehrhtdjk(entity);
-         this.clearPlayerTeam(entity.m_kcquvkhk());
+         this.clearPlayerTeam(entity.getProfileName());
       }
    }
 
Only in namedSrc/net/minecraft/scoreboard: ScoreHolder.java
diff -bur namedTargetSrc/net/minecraft/scoreboard/ServerScoreboard.java namedSrc/net/minecraft/scoreboard/ServerScoreboard.java
--- namedTargetSrc/net/minecraft/scoreboard/ServerScoreboard.java	2023-12-06 20:06:43.777274460 +0000
+++ namedSrc/net/minecraft/scoreboard/ServerScoreboard.java	2023-12-06 20:05:40.792281307 +0000
@@ -14,7 +14,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.unmapped.C_cwhcssbd;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_lfemghur;
 import net.minecraft.world.PersistentState;
 import org.jetbrains.annotations.Nullable;
@@ -52,12 +51,12 @@
     * Mapping not found
     */
    @Override
-   protected void updateScore(C_hswmfudr arg, ScoreboardObjective arg2, ScoreboardPlayerScore score) {
+   protected void updateScore(ScoreHolder arg, ScoreboardObjective arg2, ScoreboardPlayerScore score) {
       super.updateScore(arg, arg2, score);
       if (this.objectives.contains(arg2)) {
          this.server
             .getPlayerManager()
-            .sendToAll(new ScoreboardPlayerUpdateS2CPacket(arg.m_kcquvkhk(), arg2.getName(), score.m_lpdvqurp(), score.m_qkwdnogd(), score.m_oepthxro()));
+            .sendToAll(new ScoreboardPlayerUpdateS2CPacket(arg.getProfileName(), arg2.getName(), score.m_lpdvqurp(), score.m_qkwdnogd(), score.m_oepthxro()));
       }
 
       this.runUpdateListeners();
@@ -67,7 +66,7 @@
     * Mapping not found
     */
    @Override
-   protected void m_gmemzclj(C_hswmfudr arg, ScoreboardObjective arg2) {
+   protected void m_gmemzclj(ScoreHolder arg, ScoreboardObjective arg2) {
       super.m_gmemzclj(arg, arg2);
       this.runUpdateListeners();
    }
@@ -76,9 +75,9 @@
     * Mapping not found
     */
    @Override
-   public void updatePlayerScore(C_hswmfudr arg) {
+   public void updatePlayerScore(ScoreHolder arg) {
       super.updatePlayerScore(arg);
-      this.server.getPlayerManager().sendToAll(new C_cwhcssbd(arg.m_kcquvkhk(), null));
+      this.server.getPlayerManager().sendToAll(new C_cwhcssbd(arg.getProfileName(), null));
       this.runUpdateListeners();
    }
 
@@ -86,10 +85,10 @@
     * Mapping not found
     */
    @Override
-   public void updatePlayerScore(C_hswmfudr arg, ScoreboardObjective objective) {
+   public void updatePlayerScore(ScoreHolder arg, ScoreboardObjective objective) {
       super.updatePlayerScore(arg, objective);
       if (this.objectives.contains(objective)) {
-         this.server.getPlayerManager().sendToAll(new C_cwhcssbd(arg.m_kcquvkhk(), objective.getName()));
+         this.server.getPlayerManager().sendToAll(new C_cwhcssbd(arg.getProfileName(), objective.getName()));
       }
 
       this.runUpdateListeners();
diff -bur namedTargetSrc/net/minecraft/screen/slot/CraftingResultSlot.java namedSrc/net/minecraft/screen/slot/CraftingResultSlot.java
--- namedTargetSrc/net/minecraft/screen/slot/CraftingResultSlot.java	2023-12-06 20:06:44.013278211 +0000
+++ namedSrc/net/minecraft/screen/slot/CraftingResultSlot.java	2023-12-06 20:05:41.076285784 +0000
@@ -87,7 +87,7 @@
 
       Inventory var3 = this.inventory;
       if (var3 instanceof C_mudajugr lv) {
-         lv.m_qysvzsry(this.player, this.input.getIngredients());
+         lv.m_qysvzsry(this.player, this.input.getInvStack());
       }
 
       this.amount = 0;
diff -bur namedTargetSrc/net/minecraft/server/command/ScoreboardCommand.java namedSrc/net/minecraft/server/command/ScoreboardCommand.java
--- namedTargetSrc/net/minecraft/server/command/ScoreboardCommand.java	2023-12-06 20:06:43.837275414 +0000
+++ namedSrc/net/minecraft/server/command/ScoreboardCommand.java	2023-12-06 20:05:40.876282631 +0000
@@ -25,6 +25,7 @@
 import net.minecraft.command.argument.ScoreboardObjectiveArgumentType;
 import net.minecraft.command.argument.ScoreboardSlotArgumentType;
 import net.minecraft.command.argument.TextArgumentType;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardCriterion;
 import net.minecraft.scoreboard.ScoreboardDisplaySlot;
@@ -35,7 +36,6 @@
 import net.minecraft.unmapped.C_cgozgvuy;
 import net.minecraft.unmapped.C_ctcbtkhc;
 import net.minecraft.unmapped.C_dhcveoxh;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_qwlnyyss;
 import net.minecraft.unmapped.C_rxcsyavv;
 import net.minecraft.unmapped.C_vgsaeqvm;
@@ -455,7 +455,7 @@
     * @mapping {@literal hashed m_azbhsnne Lnet/minecraft/unmapped/C_mwzyzhsx;m_azbhsnne(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;}
     * @mapping {@literal named suggestDisabled Lnet/minecraft/server/command/ScoreboardCommand;suggestDisabled(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private static CompletableFuture<Suggestions> suggestDisabled(ServerCommandSource source, Collection<C_hswmfudr> targets, SuggestionsBuilder builder) {
+   private static CompletableFuture<Suggestions> suggestDisabled(ServerCommandSource source, Collection<ScoreHolder> targets, SuggestionsBuilder builder) {
       List<String> list = Lists.<String>newArrayList();
       Scoreboard lv = source.getServer().getScoreboard();
 
@@ -463,7 +463,7 @@
          if (lv2.getCriterion() == ScoreboardCriterion.TRIGGER) {
             boolean bl = false;
 
-            for (C_hswmfudr lv3 : targets) {
+            for (ScoreHolder lv3 : targets) {
                C_vgsaeqvm lv4 = lv.m_ntnuhjcd(lv3, lv2);
                if (lv4 == null || lv4.m_essjykff()) {
                   bl = true;
@@ -482,16 +482,16 @@
 
    /**
     * @mapping {@literal hashed m_phqtxkeb Lnet/minecraft/unmapped/C_mwzyzhsx;m_phqtxkeb(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_tlhwodcf;)I}
-    * @mapping {@literal named executeGet Lnet/minecraft/server/command/ScoreboardCommand;executeGet(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/scoreboard/ScoreboardObjective;)I}
+    * @mapping {@literal named executeGet Lnet/minecraft/server/command/ScoreboardCommand;executeGet(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/scoreboard/ScoreboardObjective;)I}
     */
-   private static int executeGet(ServerCommandSource source, C_hswmfudr arg2, ScoreboardObjective objective) throws CommandSyntaxException {
+   private static int executeGet(ServerCommandSource source, ScoreHolder arg2, ScoreboardObjective objective) throws CommandSyntaxException {
       Scoreboard lv = source.getServer().getScoreboard();
       C_vgsaeqvm lv2 = lv.m_ntnuhjcd(arg2, objective);
       if (lv2 == null) {
          throw PLAYERS_GET_NULL_EXCEPTION.create(objective.getName(), arg2);
       } else {
          source.sendFeedback(
-            () -> Text.translatable("commands.scoreboard.players.get.success", arg2.m_hctfxpqq(), lv2.m_lpdvqurp(), objective.toHoverableText()), false
+            () -> Text.translatable("commands.scoreboard.players.get.success", arg2.getNameWithEffects(), lv2.m_lpdvqurp(), objective.toHoverableText()), false
          );
          return lv2.m_lpdvqurp();
       }
@@ -500,8 +500,8 @@
    /**
     * Mapping not found
     */
-   private static Text m_hcismexo(Collection<C_hswmfudr> collection) {
-      return ((C_hswmfudr)collection.iterator().next()).m_hctfxpqq();
+   private static Text m_hcismexo(Collection<ScoreHolder> collection) {
+      return ((ScoreHolder)collection.iterator().next()).getNameWithEffects();
    }
 
    /**
@@ -510,19 +510,19 @@
     */
    private static int executeOperation(
       ServerCommandSource source,
-      Collection<C_hswmfudr> targets,
+      Collection<ScoreHolder> targets,
       ScoreboardObjective targetObjective,
       OperationArgumentType.Operation operation,
-      Collection<C_hswmfudr> sources,
+      Collection<ScoreHolder> sources,
       ScoreboardObjective sourceObjectives
    ) throws CommandSyntaxException {
       Scoreboard lv = source.getServer().getScoreboard();
       int i = 0;
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          C_qwlnyyss lv3 = lv.m_jhiwvwxm(lv2, targetObjective);
 
-         for (C_hswmfudr lv4 : sources) {
+         for (ScoreHolder lv4 : sources) {
             C_qwlnyyss lv5 = lv.m_jhiwvwxm(lv4, sourceObjectives);
             operation.apply(lv3, lv5);
          }
@@ -548,14 +548,14 @@
     * @mapping {@literal hashed m_vawwhxaw Lnet/minecraft/unmapped/C_mwzyzhsx;m_vawwhxaw(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;)I}
     * @mapping {@literal named executeEnable Lnet/minecraft/server/command/ScoreboardCommand;executeEnable(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;)I}
     */
-   private static int executeEnable(ServerCommandSource source, Collection<C_hswmfudr> targets, ScoreboardObjective objective) throws CommandSyntaxException {
+   private static int executeEnable(ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective) throws CommandSyntaxException {
       if (objective.getCriterion() != ScoreboardCriterion.TRIGGER) {
          throw PLAYERS_ENABLE_INVALID_EXCEPTION.create();
       } else {
          Scoreboard lv = source.getServer().getScoreboard();
          int i = 0;
 
-         for (C_hswmfudr lv2 : targets) {
+         for (ScoreHolder lv2 : targets) {
             C_qwlnyyss lv3 = lv.m_jhiwvwxm(lv2, objective);
             if (lv3.m_pezntiti()) {
                lv3.m_ldzawafx();
@@ -585,10 +585,10 @@
     * @mapping {@literal hashed m_ywikndaw Lnet/minecraft/unmapped/C_mwzyzhsx;m_ywikndaw(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;)I}
     * @mapping {@literal named executeReset Lnet/minecraft/server/command/ScoreboardCommand;executeReset(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;)I}
     */
-   private static int executeReset(ServerCommandSource source, Collection<C_hswmfudr> targets) {
+   private static int executeReset(ServerCommandSource source, Collection<ScoreHolder> targets) {
       Scoreboard lv = source.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          lv.m_ehrhtdjk(lv2);
       }
 
@@ -605,10 +605,10 @@
     * @mapping {@literal hashed m_uzpheert Lnet/minecraft/unmapped/C_mwzyzhsx;m_uzpheert(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;)I}
     * @mapping {@literal named executeReset Lnet/minecraft/server/command/ScoreboardCommand;executeReset(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;)I}
     */
-   private static int executeReset(ServerCommandSource source, Collection<C_hswmfudr> targets, ScoreboardObjective objective) {
+   private static int executeReset(ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective) {
       Scoreboard lv = source.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          lv.m_hudewirl(lv2, objective);
       }
 
@@ -627,10 +627,10 @@
     * @mapping {@literal hashed m_ehrpcfnu Lnet/minecraft/unmapped/C_mwzyzhsx;m_ehrpcfnu(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;I)I}
     * @mapping {@literal named executeSet Lnet/minecraft/server/command/ScoreboardCommand;executeSet(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;I)I}
     */
-   private static int executeSet(ServerCommandSource source, Collection<C_hswmfudr> targets, ScoreboardObjective objective, int score) {
+   private static int executeSet(ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective, int score) {
       Scoreboard lv = source.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          lv.m_jhiwvwxm(lv2, objective).m_gujrxgak(score);
       }
 
@@ -650,10 +650,10 @@
    /**
     * Mapping not found
     */
-   private static int m_fsjgvqnw(ServerCommandSource arg, Collection<C_hswmfudr> collection, ScoreboardObjective arg2, @Nullable Text arg3) {
+   private static int m_fsjgvqnw(ServerCommandSource arg, Collection<ScoreHolder> collection, ScoreboardObjective arg2, @Nullable Text arg3) {
       Scoreboard lv = arg.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : collection) {
+      for (ScoreHolder lv2 : collection) {
          lv.m_jhiwvwxm(lv2, arg2).m_azfhlxap(arg3);
       }
 
@@ -683,10 +683,10 @@
    /**
     * Mapping not found
     */
-   private static int m_mxhgurye(ServerCommandSource arg, Collection<C_hswmfudr> collection, ScoreboardObjective arg2, @Nullable C_zhwspcux arg3) {
+   private static int m_mxhgurye(ServerCommandSource arg, Collection<ScoreHolder> collection, ScoreboardObjective arg2, @Nullable C_zhwspcux arg3) {
       Scoreboard lv = arg.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : collection) {
+      for (ScoreHolder lv2 : collection) {
          lv.m_jhiwvwxm(lv2, arg2).m_tmwhwsxs(arg3);
       }
 
@@ -720,11 +720,11 @@
     * @mapping {@literal hashed m_rfpyreyy Lnet/minecraft/unmapped/C_mwzyzhsx;m_rfpyreyy(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;I)I}
     * @mapping {@literal named executeAdd Lnet/minecraft/server/command/ScoreboardCommand;executeAdd(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;I)I}
     */
-   private static int executeAdd(ServerCommandSource source, Collection<C_hswmfudr> targets, ScoreboardObjective objective, int score) {
+   private static int executeAdd(ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective, int score) {
       Scoreboard lv = source.getServer().getScoreboard();
       int j = 0;
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          C_qwlnyyss lv3 = lv.m_jhiwvwxm(lv2, objective);
          lv3.m_gujrxgak(lv3.m_rkesjhhx() + score);
          j += lv3.m_rkesjhhx();
@@ -748,11 +748,11 @@
     * @mapping {@literal hashed m_kesjhibl Lnet/minecraft/unmapped/C_mwzyzhsx;m_kesjhibl(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;I)I}
     * @mapping {@literal named executeRemove Lnet/minecraft/server/command/ScoreboardCommand;executeRemove(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;I)I}
     */
-   private static int executeRemove(ServerCommandSource source, Collection<C_hswmfudr> targets, ScoreboardObjective objective, int score) {
+   private static int executeRemove(ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective, int score) {
       Scoreboard lv = source.getServer().getScoreboard();
       int j = 0;
 
-      for (C_hswmfudr lv2 : targets) {
+      for (ScoreHolder lv2 : targets) {
          C_qwlnyyss lv3 = lv.m_jhiwvwxm(lv2, objective);
          lv3.m_gujrxgak(lv3.m_rkesjhhx() - score);
          j += lv3.m_rkesjhhx();
@@ -777,12 +777,13 @@
     * @mapping {@literal named executeListPlayers Lnet/minecraft/server/command/ScoreboardCommand;executeListPlayers(Lnet/minecraft/server/command/ServerCommandSource;)I}
     */
    private static int executeListPlayers(ServerCommandSource source) {
-      Collection<C_hswmfudr> collection = source.getServer().getScoreboard().getKnownPlayers();
+      Collection<ScoreHolder> collection = source.getServer().getScoreboard().getKnownPlayers();
       if (collection.isEmpty()) {
          source.sendFeedback(() -> Text.translatable("commands.scoreboard.players.list.empty"), false);
       } else {
          source.sendFeedback(
-            () -> Text.translatable("commands.scoreboard.players.list.success", collection.size(), Texts.join(collection, C_hswmfudr::m_hctfxpqq)), false
+            () -> Text.translatable("commands.scoreboard.players.list.success", collection.size(), Texts.join(collection, ScoreHolder::getNameWithEffects)),
+            false
          );
       }
 
@@ -791,14 +792,14 @@
 
    /**
     * @mapping {@literal hashed m_sizcnfav Lnet/minecraft/unmapped/C_mwzyzhsx;m_sizcnfav(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_hswmfudr;)I}
-    * @mapping {@literal named executeListScores Lnet/minecraft/server/command/ScoreboardCommand;executeListScores(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/unmapped/C_hswmfudr;)I}
+    * @mapping {@literal named executeListScores Lnet/minecraft/server/command/ScoreboardCommand;executeListScores(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/scoreboard/ScoreHolder;)I}
     */
-   private static int executeListScores(ServerCommandSource source, C_hswmfudr arg2) {
+   private static int executeListScores(ServerCommandSource source, ScoreHolder arg2) {
       Object2IntMap<ScoreboardObjective> object2IntMap = source.getServer().getScoreboard().m_wltptshg(arg2);
       if (object2IntMap.isEmpty()) {
-         source.sendFeedback(() -> Text.translatable("commands.scoreboard.players.list.entity.empty", arg2.m_hctfxpqq()), false);
+         source.sendFeedback(() -> Text.translatable("commands.scoreboard.players.list.entity.empty", arg2.getNameWithEffects()), false);
       } else {
-         source.sendFeedback(() -> Text.translatable("commands.scoreboard.players.list.entity.success", arg2.m_hctfxpqq(), object2IntMap.size()), false);
+         source.sendFeedback(() -> Text.translatable("commands.scoreboard.players.list.entity.success", arg2.getNameWithEffects(), object2IntMap.size()), false);
          Object2IntMaps.fastForEach(
             object2IntMap,
             entry -> source.sendFeedback(
diff -bur namedTargetSrc/net/minecraft/server/command/TeamCommand.java namedSrc/net/minecraft/server/command/TeamCommand.java
--- namedTargetSrc/net/minecraft/server/command/TeamCommand.java	2023-12-06 20:06:44.021278338 +0000
+++ namedSrc/net/minecraft/server/command/TeamCommand.java	2023-12-06 20:05:41.088285974 +0000
@@ -13,11 +13,11 @@
 import net.minecraft.command.argument.TeamArgumentType;
 import net.minecraft.command.argument.TextArgumentType;
 import net.minecraft.scoreboard.AbstractTeam;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.util.Formatting;
 
 /**
@@ -367,19 +367,19 @@
    /**
     * Mapping not found
     */
-   private static Text m_fzhbvuzm(Collection<C_hswmfudr> collection) {
-      return ((C_hswmfudr)collection.iterator().next()).m_hctfxpqq();
+   private static Text m_fzhbvuzm(Collection<ScoreHolder> collection) {
+      return ((ScoreHolder)collection.iterator().next()).getNameWithEffects();
    }
 
    /**
     * @mapping {@literal hashed m_rgofwyas Lnet/minecraft/unmapped/C_esqmizvy;m_rgofwyas(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;)I}
     * @mapping {@literal named executeLeave Lnet/minecraft/server/command/TeamCommand;executeLeave(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;)I}
     */
-   private static int executeLeave(ServerCommandSource source, Collection<C_hswmfudr> members) {
+   private static int executeLeave(ServerCommandSource source, Collection<ScoreHolder> members) {
       Scoreboard lv = source.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : members) {
-         lv.clearPlayerTeam(lv2.m_kcquvkhk());
+      for (ScoreHolder lv2 : members) {
+         lv.clearPlayerTeam(lv2.getProfileName());
       }
 
       if (members.size() == 1) {
@@ -395,11 +395,11 @@
     * @mapping {@literal hashed m_bnptvszy Lnet/minecraft/unmapped/C_esqmizvy;m_bnptvszy(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_dvkwmbxw;Ljava/util/Collection;)I}
     * @mapping {@literal named executeJoin Lnet/minecraft/server/command/TeamCommand;executeJoin(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/scoreboard/Team;Ljava/util/Collection;)I}
     */
-   private static int executeJoin(ServerCommandSource source, Team team, Collection<C_hswmfudr> members) {
+   private static int executeJoin(ServerCommandSource source, Team team, Collection<ScoreHolder> members) {
       Scoreboard lv = source.getServer().getScoreboard();
 
-      for (C_hswmfudr lv2 : members) {
-         lv.addPlayerToTeam(lv2.m_kcquvkhk(), team);
+      for (ScoreHolder lv2 : members) {
+         lv.addPlayerToTeam(lv2.getProfileName(), team);
       }
 
       if (members.size() == 1) {
diff -bur namedTargetSrc/net/minecraft/server/command/TriggerCommand.java namedSrc/net/minecraft/server/command/TriggerCommand.java
--- namedTargetSrc/net/minecraft/server/command/TriggerCommand.java	2023-12-06 20:06:43.773274396 +0000
+++ namedSrc/net/minecraft/server/command/TriggerCommand.java	2023-12-06 20:05:40.788281244 +0000
@@ -11,12 +11,12 @@
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.ScoreboardObjectiveArgumentType;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardCriterion;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_qwlnyyss;
 import net.minecraft.unmapped.C_vgsaeqvm;
 
@@ -92,7 +92,7 @@
     * @mapping {@literal named suggestObjectives Lnet/minecraft/server/command/TriggerCommand;suggestObjectives(Lnet/minecraft/server/command/ServerCommandSource;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;}
     */
    public static CompletableFuture<Suggestions> suggestObjectives(ServerCommandSource source, SuggestionsBuilder builder) {
-      C_hswmfudr lv = source.getEntity();
+      ScoreHolder lv = source.getEntity();
       List<String> list = Lists.<String>newArrayList();
       if (lv != null) {
          Scoreboard lv2 = source.getServer().getScoreboard();
@@ -145,9 +145,9 @@
 
    /**
     * @mapping {@literal hashed m_vtlgisja Lnet/minecraft/unmapped/C_tyknvcwu;m_vtlgisja(Lnet/minecraft/unmapped/C_ymwyplge;Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_tlhwodcf;)Lnet/minecraft/unmapped/C_qwlnyyss;}
-    * @mapping {@literal named getScore Lnet/minecraft/server/command/TriggerCommand;getScore(Lnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/scoreboard/ScoreboardObjective;)Lnet/minecraft/unmapped/C_qwlnyyss;}
+    * @mapping {@literal named getScore Lnet/minecraft/server/command/TriggerCommand;getScore(Lnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/scoreboard/ScoreboardObjective;)Lnet/minecraft/unmapped/C_qwlnyyss;}
     */
-   private static C_qwlnyyss getScore(Scoreboard arg, C_hswmfudr arg2, ScoreboardObjective objective) throws CommandSyntaxException {
+   private static C_qwlnyyss getScore(Scoreboard arg, ScoreHolder arg2, ScoreboardObjective objective) throws CommandSyntaxException {
       if (objective.getCriterion() != ScoreboardCriterion.TRIGGER) {
          throw FAILED_INVALID_EXCEPTION.create();
       } else {
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java namedSrc/net/minecraft/server/network/ServerPlayerEntity.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayerEntity.java	2023-12-06 20:06:43.989277830 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayerEntity.java	2023-12-06 20:05:41.044285280 +0000
@@ -97,6 +97,7 @@
 import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.scoreboard.AbstractTeam;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.ScoreboardCriterion;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.screen.HorseScreenHandler;
@@ -121,7 +122,6 @@
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_elrtgpva;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_niowvjqq;
 import net.minecraft.unmapped.C_qwlnyyss;
 import net.minecraft.util.Arm;
@@ -994,10 +994,10 @@
 
    /**
     * @mapping {@literal hashed m_cebghmrm Lnet/minecraft/unmapped/C_mxrobsgg;m_cebghmrm(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_hswmfudr;[Lnet/minecraft/unmapped/C_adsgsrpw;)V}
-    * @mapping {@literal named updateScoreboardScore Lnet/minecraft/server/network/ServerPlayerEntity;updateScoreboardScore(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_hswmfudr;[Lnet/minecraft/scoreboard/ScoreboardCriterion;)V}
+    * @mapping {@literal named updateScoreboardScore Lnet/minecraft/server/network/ServerPlayerEntity;updateScoreboardScore(Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/scoreboard/ScoreHolder;[Lnet/minecraft/scoreboard/ScoreboardCriterion;)V}
     */
-   private void updateScoreboardScore(C_hswmfudr arg, C_hswmfudr arg2, ScoreboardCriterion[] criterions) {
-      Team lv = this.getScoreboard().getPlayerTeam(arg2.m_kcquvkhk());
+   private void updateScoreboardScore(ScoreHolder arg, ScoreHolder arg2, ScoreboardCriterion[] criterions) {
+      Team lv = this.getScoreboard().getPlayerTeam(arg2.getProfileName());
       if (lv != null) {
          int i = lv.getColor().getColorIndex();
          if (i >= 0 && i < criterions.length) {

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/2): 
diff -bur namedTargetSrc/net/minecraft/text/component/ScoreComponent.java namedSrc/net/minecraft/text/component/ScoreComponent.java
--- namedTargetSrc/net/minecraft/text/component/ScoreComponent.java	2023-12-06 20:06:43.953277258 +0000
+++ namedSrc/net/minecraft/text/component/ScoreComponent.java	2023-12-06 20:05:41.012284775 +0000
@@ -10,6 +10,7 @@
 import net.minecraft.command.EntitySelectorReader;
 import net.minecraft.command.argument.EntityArgumentType;
 import net.minecraft.entity.Entity;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.server.MinecraftServer;
@@ -17,7 +18,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_ctcbtkhc;
-import net.minecraft.unmapped.C_hswmfudr;
 import net.minecraft.unmapped.C_vgsaeqvm;
 import org.jetbrains.annotations.Nullable;
 
@@ -118,9 +118,9 @@
 
    /**
     * @mapping {@literal hashed m_pojamjzu Lnet/minecraft/unmapped/C_rjywhoyw;m_pojamjzu(Lnet/minecraft/unmapped/C_pennblrk;)Lnet/minecraft/unmapped/C_hswmfudr;}
-    * @mapping {@literal named getTargetName Lnet/minecraft/text/component/ScoreComponent;getTargetName(Lnet/minecraft/server/command/ServerCommandSource;)Lnet/minecraft/unmapped/C_hswmfudr;}
+    * @mapping {@literal named getTargetName Lnet/minecraft/text/component/ScoreComponent;getTargetName(Lnet/minecraft/server/command/ServerCommandSource;)Lnet/minecraft/scoreboard/ScoreHolder;}
     */
-   private C_hswmfudr getTargetName(ServerCommandSource source) throws CommandSyntaxException {
+   private ScoreHolder getTargetName(ServerCommandSource source) throws CommandSyntaxException {
       if (this.selector != null) {
          List<? extends Entity> list = this.selector.getEntities(source);
          if (!list.isEmpty()) {
@@ -128,18 +128,18 @@
                throw EntityArgumentType.TOO_MANY_ENTITIES_EXCEPTION.create();
             }
 
-            return (C_hswmfudr)list.get(0);
+            return (ScoreHolder)list.get(0);
          }
       }
 
-      return C_hswmfudr.m_slkxlpjb(this.name);
+      return ScoreHolder.of(this.name);
    }
 
    /**
     * @mapping {@literal hashed m_flxhhgjn Lnet/minecraft/unmapped/C_rjywhoyw;m_flxhhgjn(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/unmapped/C_pennblrk;)Lnet/minecraft/unmapped/C_npqneive;}
-    * @mapping {@literal named getScore Lnet/minecraft/text/component/ScoreComponent;getScore(Lnet/minecraft/unmapped/C_hswmfudr;Lnet/minecraft/server/command/ServerCommandSource;)Lnet/minecraft/text/MutableText;}
+    * @mapping {@literal named getScore Lnet/minecraft/text/component/ScoreComponent;getScore(Lnet/minecraft/scoreboard/ScoreHolder;Lnet/minecraft/server/command/ServerCommandSource;)Lnet/minecraft/text/MutableText;}
     */
-   private MutableText getScore(C_hswmfudr arg, ServerCommandSource source) {
+   private MutableText getScore(ScoreHolder arg, ServerCommandSource source) {
       MinecraftServer minecraftServer = source.getServer();
       if (minecraftServer != null) {
          Scoreboard lv = minecraftServer.getScoreboard();
@@ -163,8 +163,8 @@
       if (source == null) {
          return Text.empty();
       } else {
-         C_hswmfudr lv = this.getTargetName(source);
-         C_hswmfudr lv2 = (C_hswmfudr)(entity != null && lv.equals(C_hswmfudr.f_pmpdsbtk) ? entity : lv);
+         ScoreHolder lv = this.getTargetName(source);
+         ScoreHolder lv2 = (ScoreHolder)(entity != null && lv.equals(ScoreHolder.WILDCARD) ? entity : lv);
          return this.getScore(lv2, source);
       }
    }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_edmnjlch.java namedSrc/net/minecraft/unmapped/C_edmnjlch.java
--- namedTargetSrc/net/minecraft/unmapped/C_edmnjlch.java	2023-12-06 20:06:43.853275667 +0000
+++ namedSrc/net/minecraft/unmapped/C_edmnjlch.java	2023-12-06 20:05:40.892282884 +0000
@@ -47,7 +47,7 @@
 
          for (int i = 0; i < this.f_kabklmfv.length; ++i) {
             C_edmnjlch.C_raahqxfc lv = this.f_kabklmfv[i];
-            if (lv != null && lv.m_ocoodxth(arg2.getIngredients())) {
+            if (lv != null && lv.m_ocoodxth(arg2.getInvStack())) {
                this.m_qifbizlb(i);
                return Optional.ofNullable(lv.value());
             }
@@ -75,7 +75,7 @@
     */
    private Optional<CraftingRecipe> m_cwdmboht(RecipeInputInventory arg, World world) {
       Optional<RecipeHolder<CraftingRecipe>> optional = world.getRecipeManager().getFirstMatch(RecipeType.CRAFTING, arg, world);
-      this.m_gsxudlwe(arg.getIngredients(), (CraftingRecipe)optional.map(RecipeHolder::value).orElse(null));
+      this.m_gsxudlwe(arg.getInvStack(), (CraftingRecipe)optional.map(RecipeHolder::value).orElse(null));
       return optional.map(RecipeHolder::value);
    }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_hswmfudr.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_lamqkfie.java namedSrc/net/minecraft/unmapped/C_lamqkfie.java
--- namedTargetSrc/net/minecraft/unmapped/C_lamqkfie.java	2023-12-06 20:06:44.017278275 +0000
+++ namedSrc/net/minecraft/unmapped/C_lamqkfie.java	2023-12-06 20:05:41.084285911 +0000
@@ -285,9 +285,9 @@
 
    /**
     * @mapping {@literal hashed m_qkfbvwxz Lnet/minecraft/unmapped/C_lamqkfie;m_qkfbvwxz()Lnet/minecraft/unmapped/C_rnrfftze;}
-    * @mapping {@literal named getIngredients Lnet/minecraft/unmapped/C_lamqkfie;getIngredients()Lnet/minecraft/util/collection/DefaultedList;}
+    * @mapping {@literal named getInvStack Lnet/minecraft/unmapped/C_lamqkfie;getInvStack()Lnet/minecraft/util/collection/DefaultedList;}
     */
-   public DefaultedList<ItemStack> getIngredients() {
+   public DefaultedList<ItemStack> getInvStack() {
       return this.f_bqaatywv;
    }
 
diff -bur namedTargetSrc/net/minecraft/unmapped/C_ytmhosha.java namedSrc/net/minecraft/unmapped/C_ytmhosha.java
--- namedTargetSrc/net/minecraft/unmapped/C_ytmhosha.java	2023-12-06 20:06:44.037278593 +0000
+++ namedSrc/net/minecraft/unmapped/C_ytmhosha.java	2023-12-06 20:05:41.108286289 +0000
@@ -78,6 +78,7 @@
 import net.minecraft.predicate.NumberRange;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.scoreboard.ScoreHolder;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.server.command.BossBarCommand;
@@ -468,10 +469,10 @@
    /**
     * Mapping not found
     */
-   private static ServerCommandSource m_mhorrevj(ServerCommandSource arg, Collection<C_hswmfudr> collection, ScoreboardObjective arg2, boolean bl) {
+   private static ServerCommandSource m_mhorrevj(ServerCommandSource arg, Collection<ScoreHolder> collection, ScoreboardObjective arg2, boolean bl) {
       Scoreboard lv = arg.getServer().getScoreboard();
       return arg.m_epwgklnj((bl2, i) -> {
-         for (C_hswmfudr lvx : collection) {
+         for (ScoreHolder lvx : collection) {
             C_qwlnyyss lv2 = lv.m_jhiwvwxm(lvx, arg2);
             int j = bl ? i : (bl2 ? 1 : 0);
             lv2.m_gujrxgak(j);
@@ -786,9 +787,9 @@
     * Mapping not found
     */
    private static boolean m_odyatsno(CommandContext<ServerCommandSource> commandContext, C_ytmhosha.C_bhejzcgo arg) throws CommandSyntaxException {
-      C_hswmfudr lv = ScoreHolderArgumentType.getScoreHolder(commandContext, "target");
+      ScoreHolder lv = ScoreHolderArgumentType.getScoreHolder(commandContext, "target");
       ScoreboardObjective lv2 = ScoreboardObjectiveArgumentType.getObjective(commandContext, "targetObjective");
-      C_hswmfudr lv3 = ScoreHolderArgumentType.getScoreHolder(commandContext, "source");
+      ScoreHolder lv3 = ScoreHolderArgumentType.getScoreHolder(commandContext, "source");
       ScoreboardObjective lv4 = ScoreboardObjectiveArgumentType.getObjective(commandContext, "sourceObjective");
       Scoreboard lv5 = commandContext.getSource().getServer().getScoreboard();
       C_vgsaeqvm lv6 = lv5.m_ntnuhjcd(lv, lv2);
@@ -800,7 +801,7 @@
     * Mapping not found
     */
    private static boolean m_rgbdxqtx(CommandContext<ServerCommandSource> commandContext, NumberRange.IntRange arg) throws CommandSyntaxException {
-      C_hswmfudr lv = ScoreHolderArgumentType.getScoreHolder(commandContext, "target");
+      ScoreHolder lv = ScoreHolderArgumentType.getScoreHolder(commandContext, "target");
       ScoreboardObjective lv2 = ScoreboardObjectiveArgumentType.getObjective(commandContext, "targetObjective");
       Scoreboard lv3 = commandContext.getSource().getServer().getScoreboard();
       C_vgsaeqvm lv4 = lv3.m_ntnuhjcd(lv, lv2);

Please sign in to comment.