Skip to content

Commit

Permalink
Capital Letters
Browse files Browse the repository at this point in the history 
Co-authored-by: Ennui Langeweile <[email protected]>
  • Loading branch information
@ix0rai @EnnuiL
ix0rai and EnnuiL authored Aug 6, 2023
1 parent fb93bbd commit 9780e92
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GUIDE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,4 @@ You can change the theme in the menu bar, under `Theme`.
## Found a bug?

Enigma in its current state is a famously broken piece of software, and we're working hard to fix it!
If you find the slightest bug or have an idea to improve it, please submit it on [our issue tracker](https://github.com/quiltmc/enigma/issues).
If you find the slightest bug or have an idea to improve it, please submit it on [our issue tracker](https://github.com/QuiltMC/enigma/issues).
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Quilt Mappings is a set of open, accurate, and easy-to-understand Minecraft mapp
under the Creative Commons Zero license. Quilt Mappings seeks to provide the best of
both worlds in terms of mapping quality: the accuracy and completeness of Mojang's
official mappings, and the simplicity and set-in-stone conventions of its basis, the
[Yarn](https://github.com/fabricmc/yarn) project.
[Yarn](https://github.com/FabricMC/yarn) project.

Quilt Mappings exists to provide a stable set of mappings for everyone to contribute
and improve upon. We provide mappings for all versions of Minecraft from 1.17 onwards.
To see what version is currently being targeted for updates, check the current Git branch's name.

## Using QM

To use Quilt Mappings in your mod, you can use either [quilt-loom](https://github.com/quiltmc/quilt-loom)
for Quilt mods or use our Intermediary publication on [Fabric's loom](https://github.com/fabricmc/fabric-loom)
for Fabric mods. We recommend cloning the [Quilt Template Mod](https://github.com/quiltmc/quilt-template-mod)
To use Quilt Mappings in your mod, you can use either [quilt-loom](https://github.com/QuiltMC/quilt-loom)
for Quilt mods or use our Intermediary publication on [Fabric's loom](https://github.com/FabricMC/fabric-loom)
for Fabric mods. We recommend cloning the [Quilt Template Mod](https://github.com/QuiltMC/quilt-template-mod)
to start a new mod with QM, and you can also add this block to your `build.gradle` inside the `dependencies` block:

```groovy
Expand Down Expand Up @@ -52,7 +52,7 @@ please see the guide in [CONTRIBUTING.md](CONTRIBUTING.md#guide-pull-requests)!
QM has a set of helpful Gradle tasks to make mapping easier, including:

### `mappings`
Setup, download, and launch the latest version of [Enigma](https://github.com/QuiltMC/Enigma) automatically configured to use the merged jar and the mappings.
Setup, download, and launch the latest version of [Enigma](https://github.com/QuiltMC/enigma) automatically configured to use the merged jar and the mappings.

Compared to launching Enigma externally, the gradle task adds a name guesser plugin that automatically maps enums and a few constant field names.

Expand Down

3 comments on commit 9780e92

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 9780e92, 161 file(s) were updated with 1436 line(s) added and 1515 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
Only in namedSrc/net/minecraft/block: AbstractCauldronBlock.java
Only in namedSrc/net/minecraft/block: AbstractSignBlock.java
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2023-08-06 01:21:37.110339093 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2023-08-06 01:19:56.576904043 +0000
@@ -2,11 +2,6 @@
 
 import java.util.function.ToIntFunction;
 import net.minecraft.block.cauldron.CauldronBehavior;
-import net.minecraft.block.cauldron.CauldronBlock;
-import net.minecraft.block.cauldron.LavaCauldronBlock;
-import net.minecraft.block.cauldron.LeveledCauldronBlock;
-import net.minecraft.block.cauldron.PowderSnowCauldronBlock;
-import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.ShulkerBoxBlockEntity;
@@ -14,27 +9,13 @@
 import net.minecraft.block.enums.NoteBlockInstrument;
 import net.minecraft.block.enums.SculkSensorPhase;
 import net.minecraft.block.piston.PistonBehavior;
-import net.minecraft.block.piston.PistonBlock;
-import net.minecraft.block.piston.PistonExtensionBlock;
-import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.block.sapling.AcaciaSaplingGenerator;
 import net.minecraft.block.sapling.BirchSaplingGenerator;
 import net.minecraft.block.sapling.CherrySaplingGenerator;
 import net.minecraft.block.sapling.DarkOakSaplingGenerator;
 import net.minecraft.block.sapling.JungleSaplingGenerator;
 import net.minecraft.block.sapling.OakSaplingGenerator;
-import net.minecraft.block.sapling.SaplingBlock;
 import net.minecraft.block.sapling.SpruceSaplingGenerator;
-import net.minecraft.block.sculk.SculkBlock;
-import net.minecraft.block.sculk.SculkCatalystBlock;
-import net.minecraft.block.sculk.SculkSensorBlock;
-import net.minecraft.block.sculk.SculkShriekerBlock;
-import net.minecraft.block.sculk.SculkVeinBlock;
-import net.minecraft.block.sign.CeilingHangingSignBlock;
-import net.minecraft.block.sign.SignBlock;
-import net.minecraft.block.sign.SignType;
-import net.minecraft.block.sign.WallHangingSignBlock;
-import net.minecraft.block.sign.WallSignBlock;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.feature_flags.FeatureFlag;
@@ -47,6 +28,7 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.DyeColor;
+import net.minecraft.util.SignType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -11318,7 +11300,7 @@
 
    /**
     * @mapping {@literal hashed m_wbxhpkfm Lnet/minecraft/unmapped/C_qceyzrkd;m_wbxhpkfm(Z)Lnet/minecraft/unmapped/C_tpdcefvs;}
-    * @mapping {@literal named createPistonBlock Lnet/minecraft/block/Blocks;createPistonBlock(Z)Lnet/minecraft/block/piston/PistonBlock;}
+    * @mapping {@literal named createPistonBlock Lnet/minecraft/block/Blocks;createPistonBlock(Z)Lnet/minecraft/block/PistonBlock;}
     */
    private static PistonBlock createPistonBlock(boolean sticky) {
       AbstractBlock.ContextPredicate lv = (state, world, pos) -> !state.get(PistonBlock.EXTENDED);
diff -bur namedTargetSrc/net/minecraft/block/CalibratedSculkSensorBlock.java namedSrc/net/minecraft/block/CalibratedSculkSensorBlock.java
--- namedTargetSrc/net/minecraft/block/CalibratedSculkSensorBlock.java	2023-08-06 01:21:37.098338920 +0000
+++ namedSrc/net/minecraft/block/CalibratedSculkSensorBlock.java	2023-08-06 01:19:56.564903868 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.CalibratedSculkSensorBlockEntity;
-import net.minecraft.block.sculk.SculkSensorBlock;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.DirectionProperty;
Only in namedTargetSrc/net/minecraft/block/cauldron: AbstractCauldronBlock.java
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2023-08-06 01:21:37.066338459 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2023-08-06 01:19:56.524903282 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.LeveledCauldronBlock;
 import net.minecraft.block.ShulkerBoxBlock;
 import net.minecraft.block.entity.BannerBlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
Only in namedTargetSrc/net/minecraft/block/cauldron: CauldronBlock.java
Only in namedTargetSrc/net/minecraft/block/cauldron: LavaCauldronBlock.java
Only in namedTargetSrc/net/minecraft/block/cauldron: LeveledCauldronBlock.java
Only in namedTargetSrc/net/minecraft/block/cauldron: PowderSnowCauldronBlock.java
Only in namedSrc/net/minecraft/block: CauldronBlock.java
Only in namedSrc/net/minecraft/block: CeilingHangingSignBlock.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2023-08-06 01:21:37.194340302 +0000
+++ namedSrc/net/minecraft/block/dispenser/BlockPlacementDispenserBehavior.java	2023-08-06 01:19:56.684905624 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.block.dispenser;
 
 import com.mojang.logging.LogUtils;
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.item.AutomaticItemPlacementContext;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2023-08-06 01:21:37.182340129 +0000
+++ namedSrc/net/minecraft/block/dispenser/BoatDispenserBehavior.java	2023-08-06 01:19:56.664905332 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block.dispenser;
 
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.entity.vehicle.ChestBoatEntity;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-08-06 01:21:37.130339380 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-08-06 01:19:56.608904512 +0000
@@ -13,6 +13,7 @@
 import net.minecraft.block.CandleBlock;
 import net.minecraft.block.CandleCakeBlock;
 import net.minecraft.block.CarvedPumpkinBlock;
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.FluidDrainable;
 import net.minecraft.block.RespawnAnchorBlock;
 import net.minecraft.block.ShulkerBoxBlock;
Only in namedTargetSrc/net/minecraft/block/dispenser: DispenserBlock.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-08-06 01:21:37.062338402 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-08-06 01:19:56.524903282 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block.dispenser;
 
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPointer;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2023-08-06 01:21:37.190340244 +0000
+++ namedSrc/net/minecraft/block/dispenser/ProjectileDispenserBehavior.java	2023-08-06 01:19:56.672905449 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.block.dispenser;
 
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPointer;
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2023-08-06 01:21:37.118339208 +0000
+++ namedSrc/net/minecraft/block/dispenser/ShearsDispenserBehavior.java	2023-08-06 01:19:56.588904219 +0000
@@ -2,6 +2,7 @@
 
 import net.minecraft.block.BeehiveBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.entity.BeehiveBlockEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.Shearable;
Only in namedSrc/net/minecraft/block: DispenserBlock.java
diff -bur namedTargetSrc/net/minecraft/block/DropperBlock.java namedSrc/net/minecraft/block/DropperBlock.java
--- namedTargetSrc/net/minecraft/block/DropperBlock.java	2023-08-06 01:21:37.042338114 +0000
+++ namedSrc/net/minecraft/block/DropperBlock.java	2023-08-06 01:19:56.492902814 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.block;
 
 import net.minecraft.block.dispenser.DispenserBehavior;
-import net.minecraft.block.dispenser.DispenserBlock;
 import net.minecraft.block.dispenser.ItemDispenserBehavior;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.DispenserBlockEntity;
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2023-08-06 01:21:37.186340186 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2023-08-06 01:19:56.668905390 +0000
@@ -5,10 +5,10 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.PistonBlock;
+import net.minecraft.block.PistonHeadBlock;
 import net.minecraft.block.enums.PistonType;
 import net.minecraft.block.piston.PistonBehavior;
-import net.minecraft.block.piston.PistonBlock;
-import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.nbt.NbtCompound;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-08-06 01:21:37.162339841 +0000
+++ namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-08-06 01:19:56.640904980 +0000
@@ -4,8 +4,8 @@
 import net.minecraft.advancement.criterion.Criteria;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.SculkCatalystBlock;
 import net.minecraft.block.sculk.SculkBehavior;
-import net.minecraft.block.sculk.SculkCatalystBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-08-06 01:21:37.178340071 +0000
+++ namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-08-06 01:19:56.660905273 +0000
@@ -4,7 +4,7 @@
 import com.mojang.serialization.Dynamic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.sculk.SculkSensorBlock;
+import net.minecraft.block.SculkSensorBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-08-06 01:21:37.178340071 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-08-06 01:19:56.656905215 +0000
@@ -7,7 +7,7 @@
 import java.util.OptionalInt;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.sculk.SculkShriekerBlock;
+import net.minecraft.block.SculkShriekerBlock;
 import net.minecraft.block.sculk.SculkShriekerWarningManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-08-06 01:21:37.198340359 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-08-06 01:19:56.692905742 +0000
@@ -5,9 +5,9 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.function.UnaryOperator;
+import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.sign.AbstractSignBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtOps;
diff -bur namedTargetSrc/net/minecraft/block/FarmlandBlock.java namedSrc/net/minecraft/block/FarmlandBlock.java
--- namedTargetSrc/net/minecraft/block/FarmlandBlock.java	2023-08-06 01:21:37.122339265 +0000
+++ namedSrc/net/minecraft/block/FarmlandBlock.java	2023-08-06 01:19:56.596904336 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.block;
 
-import net.minecraft.block.piston.PistonExtensionBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.pathing.NavigationType;
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2023-08-06 01:21:37.194340302 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2023-08-06 01:19:56.688905683 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.block;
 
-import net.minecraft.block.sign.SignType;
 import net.minecraft.entity.ai.pathing.NavigationType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -11,6 +10,7 @@
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.SignType;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -111,13 +111,13 @@
    );
    /**
     * @mapping {@literal hashed f_whecgsjr Lnet/minecraft/unmapped/C_nfehypbw;f_whecgsjr:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/block/sign/SignType;}
+    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/util/SignType;}
     */
    private final SignType signType;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nfehypbw;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_xlaykyai;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/sign/SignType;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/util/SignType;)V}
     */
    public FenceGateBlock(AbstractBlock.Settings settings, SignType signType) {
       super(settings.sounds(signType.soundType()));
Only in namedSrc/net/minecraft/block: LavaCauldronBlock.java
Only in namedSrc/net/minecraft/block: LeveledCauldronBlock.java
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-08-06 01:21:37.062338402 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-08-06 01:19:56.520903224 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.block;
 
 import net.minecraft.block.sapling.MangroveSaplingGenerator;
-import net.minecraft.block.sapling.SaplingBlock;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
Only in namedTargetSrc/net/minecraft/block/piston: PistonBlock.java
Only in namedTargetSrc/net/minecraft/block/piston: PistonExtensionBlock.java
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonHandler.java namedSrc/net/minecraft/block/piston/PistonHandler.java
--- namedTargetSrc/net/minecraft/block/piston/PistonHandler.java	2023-08-06 01:21:37.070338517 +0000
+++ namedSrc/net/minecraft/block/piston/PistonHandler.java	2023-08-06 01:19:56.532903399 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.PistonBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
Only in namedTargetSrc/net/minecraft/block/piston: PistonHeadBlock.java
Only in namedSrc/net/minecraft/block: PistonBlock.java
Only in namedSrc/net/minecraft/block: PistonExtensionBlock.java
Only in namedSrc/net/minecraft/block: PistonHeadBlock.java
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2023-08-06 01:21:37.086338747 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2023-08-06 01:19:56.548903633 +0000
@@ -4,7 +4,6 @@
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
-import net.minecraft.block.cauldron.AbstractCauldronBlock;
 import net.minecraft.block.enums.Thickness;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.FallingBlockEntity;
Only in namedSrc/net/minecraft/block: PowderSnowCauldronBlock.java
Only in namedTargetSrc/net/minecraft/block/sapling: SaplingBlock.java
Only in namedSrc/net/minecraft/block: SaplingBlock.java
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkBehavior.java namedSrc/net/minecraft/block/sculk/SculkBehavior.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkBehavior.java	2023-08-06 01:21:37.130339380 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkBehavior.java	2023-08-06 01:19:56.604904453 +0000
@@ -21,6 +21,7 @@
 import net.minecraft.block.AbstractLichenBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.SculkVeinBlock;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
Only in namedTargetSrc/net/minecraft/block/sculk: SculkBlock.java
Only in namedTargetSrc/net/minecraft/block/sculk: SculkCatalystBlock.java
Only in namedTargetSrc/net/minecraft/block/sculk: SculkSensorBlock.java
Only in namedTargetSrc/net/minecraft/block/sculk: SculkShriekerBlock.java
Only in namedTargetSrc/net/minecraft/block/sculk: SculkVeinBlock.java
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkVeinSpreader.java namedSrc/net/minecraft/block/sculk/SculkVeinSpreader.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkVeinSpreader.java	2023-08-06 01:21:37.094338862 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkVeinSpreader.java	2023-08-06 01:19:56.556903751 +0000
@@ -4,6 +4,7 @@
 import net.minecraft.block.AbstractLichenBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.SculkVeinBlock;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
Only in namedSrc/net/minecraft/block: SculkBlock.java
Only in namedSrc/net/minecraft/block: SculkCatalystBlock.java
Only in namedSrc/net/minecraft/block: SculkSensorBlock.java
Only in namedSrc/net/minecraft/block: SculkShriekerBlock.java
Only in namedSrc/net/minecraft/block: SculkVeinBlock.java
Only in namedTargetSrc/net/minecraft/block: sign
Only in namedSrc/net/minecraft/block: SignBlock.java
Only in namedSrc/net/minecraft/block: WallHangingSignBlock.java
Only in namedSrc/net/minecraft/block: WallSignBlock.java
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java namedSrc/net/minecraft/client/gui/hud/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-06 01:21:37.106339035 +0000
+++ namedSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-06 01:19:56.572903985 +0000
@@ -113,9 +113,9 @@
    private static final Text DEMO_EXPIRED_MESSAGE = Text.translatable("demo.demoExpired");
    /**
     * @mapping {@literal hashed f_mzeltiyn Lnet/minecraft/unmapped/C_nepwsmgw;f_mzeltiyn:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named AUTOSAVE_INDICATOR Lnet/minecraft/client/gui/hud/InGameHud;AUTOSAVE_INDICATOR:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named AUTOSAVE_INDICATOR_TEXT Lnet/minecraft/client/gui/hud/InGameHud;AUTOSAVE_INDICATOR_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text AUTOSAVE_INDICATOR = Text.translatable("menu.savingLevel");
+   private static final Text AUTOSAVE_INDICATOR_TEXT = Text.translatable("menu.savingLevel");
    /**
     * @mapping {@literal hashed f_aazbtyrp Lnet/minecraft/unmapped/C_nepwsmgw;f_aazbtyrp:I}
     * @mapping {@literal named WHITE Lnet/minecraft/client/gui/hud/InGameHud;WHITE:I}
@@ -1553,9 +1553,9 @@
          );
          if (i > 8) {
             TextRenderer lv = this.getTextRenderer();
-            int j = lv.getWidth(AUTOSAVE_INDICATOR);
+            int j = lv.getWidth(AUTOSAVE_INDICATOR_TEXT);
             int k = 16777215 | i << 24 & 0xFF000000;
-            graphics.drawShadowedText(lv, AUTOSAVE_INDICATOR, this.scaledWidth - j - 10, this.scaledHeight - 15, k);
+            graphics.drawShadowedText(lv, AUTOSAVE_INDICATOR_TEXT, this.scaledWidth - j - 10, this.scaledHeight - 15, k);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup.java namedSrc/net/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup.java	2023-08-06 01:21:37.150339668 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup.java	2023-08-06 01:19:56.624904746 +0000
@@ -14,9 +14,9 @@
 public class RootSpectatorCommandGroup implements SpectatorMenuCommandGroup {
    /**
     * @mapping {@literal hashed f_vtbtfoyt Lnet/minecraft/unmapped/C_koevibwh;f_vtbtfoyt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PROMPT Lnet/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup;PROMPT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PROMPT_TEXT Lnet/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup;PROMPT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PROMPT = Text.translatable("spectatorMenu.root.prompt");
+   private static final Text PROMPT_TEXT = Text.translatable("spectatorMenu.root.prompt");
    /**
     * @mapping {@literal hashed f_nxnbrdmc Lnet/minecraft/unmapped/C_koevibwh;f_nxnbrdmc:Ljava/util/List;}
     * @mapping {@literal named elements Lnet/minecraft/client/gui/hud/spectator/RootSpectatorCommandGroup;elements:Ljava/util/List;}
@@ -44,6 +44,6 @@
     */
    @Override
    public Text getPrompt() {
-      return PROMPT;
+      return PROMPT_TEXT;
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java	2023-08-06 01:21:37.050338229 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java	2023-08-06 01:19:56.508903048 +0000
@@ -43,19 +43,19 @@
    private static final int MAX_PER_PAGE = 8;
    /**
     * @mapping {@literal hashed f_uqkdxoob Lnet/minecraft/unmapped/C_zbppnqly;f_uqkdxoob:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CLOSE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;CLOSE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CLOSE_TEXT Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;CLOSE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text CLOSE = Text.translatable("spectatorMenu.close");
+   static final Text CLOSE_TEXT = Text.translatable("spectatorMenu.close");
    /**
     * @mapping {@literal hashed f_dcdtxsjo Lnet/minecraft/unmapped/C_zbppnqly;f_dcdtxsjo:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PREVIOUS_PAGE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;PREVIOUS_PAGE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PREVIOUS_PAGE_TEXT Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;PREVIOUS_PAGE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text PREVIOUS_PAGE = Text.translatable("spectatorMenu.previous_page");
+   static final Text PREVIOUS_PAGE_TEXT = Text.translatable("spectatorMenu.previous_page");
    /**
     * @mapping {@literal hashed f_zkryuwhf Lnet/minecraft/unmapped/C_zbppnqly;f_zkryuwhf:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named NEXT_PAGE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;NEXT_PAGE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named NEXT_PAGE_TEXT Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;NEXT_PAGE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text NEXT_PAGE = Text.translatable("spectatorMenu.next_page");
+   static final Text NEXT_PAGE_TEXT = Text.translatable("spectatorMenu.next_page");
    /**
     * @mapping {@literal hashed f_kegznatf Lnet/minecraft/unmapped/C_zbppnqly;f_kegznatf:Lnet/minecraft/unmapped/C_gwvsqmde;}
     * @mapping {@literal named BLANK_COMMAND Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;BLANK_COMMAND:Lnet/minecraft/client/gui/hud/spectator/SpectatorMenuCommand;}
@@ -258,7 +258,7 @@
        */
       @Override
       public Text getName() {
-         return this.direction < 0 ? SpectatorMenu.PREVIOUS_PAGE : SpectatorMenu.NEXT_PAGE;
+         return this.direction < 0 ? SpectatorMenu.PREVIOUS_PAGE_TEXT : SpectatorMenu.NEXT_PAGE_TEXT;
       }
 
       /**
@@ -301,7 +301,7 @@
        */
       @Override
       public Text getName() {
-         return SpectatorMenu.CLOSE;
+         return SpectatorMenu.CLOSE_TEXT;
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java	2023-08-06 01:21:37.098338920 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java	2023-08-06 01:19:56.564903868 +0000
@@ -27,14 +27,14 @@
 public class TeamTeleportSpectatorMenu implements SpectatorMenuCommandGroup, SpectatorMenuCommand {
    /**
     * @mapping {@literal hashed f_pcnyirer Lnet/minecraft/unmapped/C_oocustim;f_pcnyirer:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TEAM_TELEPORT Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;TEAM_TELEPORT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TEAM_TELEPORT_TEXT Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;TEAM_TELEPORT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TEAM_TELEPORT = Text.translatable("spectatorMenu.team_teleport");
+   private static final Text TEAM_TELEPORT_TEXT = Text.translatable("spectatorMenu.team_teleport");
    /**
     * @mapping {@literal hashed f_eidbbudn Lnet/minecraft/unmapped/C_oocustim;f_eidbbudn:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PROMPT Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;PROMPT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PROMPT_TEXT Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;PROMPT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PROMPT = Text.translatable("spectatorMenu.team_teleport.prompt");
+   private static final Text PROMPT_TEXT = Text.translatable("spectatorMenu.team_teleport.prompt");
    /**
     * @mapping {@literal hashed f_qfiwjtpn Lnet/minecraft/unmapped/C_oocustim;f_qfiwjtpn:Ljava/util/List;}
     * @mapping {@literal named commands Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;commands:Ljava/util/List;}
@@ -70,7 +70,7 @@
     */
    @Override
    public Text getPrompt() {
-      return PROMPT;
+      return PROMPT_TEXT;
    }
 
    /**
@@ -86,7 +86,7 @@
     */
    @Override
    public Text getName() {
-      return TEAM_TELEPORT;
+      return TEAM_TELEPORT_TEXT;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java	2023-08-06 01:21:37.150339668 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java	2023-08-06 01:19:56.628904805 +0000
@@ -25,14 +25,14 @@
    private static final Comparator<PlayerListEntry> ORDERING = Comparator.comparing(a -> a.getProfile().getId());
    /**
     * @mapping {@literal hashed f_iiaduswf Lnet/minecraft/unmapped/C_nhxcfbkg;f_iiaduswf:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TELEPORT Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;TELEPORT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TELEPORT_TEXT Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;TELEPORT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TELEPORT = Text.translatable("spectatorMenu.teleport");
+   private static final Text TELEPORT_TEXT = Text.translatable("spectatorMenu.teleport");
    /**
     * @mapping {@literal hashed f_rtnaojfz Lnet/minecraft/unmapped/C_nhxcfbkg;f_rtnaojfz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PROMPT Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;PROMPT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PROMPT_TEXT Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;PROMPT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PROMPT = Text.translatable("spectatorMenu.teleport.prompt");
+   private static final Text PROMPT_TEXT = Text.translatable("spectatorMenu.teleport.prompt");
    /**
     * @mapping {@literal hashed f_vgtlhfsg Lnet/minecraft/unmapped/C_nhxcfbkg;f_vgtlhfsg:Ljava/util/List;}
     * @mapping {@literal named elements Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;elements:Ljava/util/List;}
@@ -71,7 +71,7 @@
     */
    @Override
    public Text getPrompt() {
-      return PROMPT;
+      return PROMPT_TEXT;
    }
 
    /**
@@ -87,7 +87,7 @@
     */
    @Override
    public Text getName() {
-      return TELEPORT;
+      return TELEPORT_TEXT;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/AbuseReportScreen.java namedSrc/net/minecraft/client/gui/screen/AbuseReportScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/AbuseReportScreen.java	2023-08-06 01:21:37.118339208 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AbuseReportScreen.java	2023-08-06 01:19:56.584904160 +0000
@@ -22,19 +22,19 @@
 public class AbuseReportScreen extends Screen {
    /**
     * @mapping {@literal hashed f_pxskoqon Lnet/minecraft/unmapped/C_eagjljtr;f_pxskoqon:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ABUSE_REASON_TITLE Lnet/minecraft/client/gui/screen/AbuseReportScreen;ABUSE_REASON_TITLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ABUSE_REASON_TITLE_TEXT Lnet/minecraft/client/gui/screen/AbuseReportScreen;ABUSE_REASON_TITLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ABUSE_REASON_TITLE = Text.translatable("gui.abuseReport.reason.title");
+   private static final Text ABUSE_REASON_TITLE_TEXT = Text.translatable("gui.abuseReport.reason.title");
    /**
     * @mapping {@literal hashed f_uykdglxh Lnet/minecraft/unmapped/C_eagjljtr;f_uykdglxh:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ABUSE_REASON_DESCRIPTION Lnet/minecraft/client/gui/screen/AbuseReportScreen;ABUSE_REASON_DESCRIPTION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ABUSE_REASON_DESCRIPTION_TEXT Lnet/minecraft/client/gui/screen/AbuseReportScreen;ABUSE_REASON_DESCRIPTION_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ABUSE_REASON_DESCRIPTION = Text.translatable("gui.abuseReport.reason.description");
+   private static final Text ABUSE_REASON_DESCRIPTION_TEXT = Text.translatable("gui.abuseReport.reason.description");
    /**
     * @mapping {@literal hashed f_viwdejpr Lnet/minecraft/unmapped/C_eagjljtr;f_viwdejpr:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named REPORT_READ_INFO Lnet/minecraft/client/gui/screen/AbuseReportScreen;REPORT_READ_INFO:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named REPORT_READ_INFO_TEXT Lnet/minecraft/client/gui/screen/AbuseReportScreen;REPORT_READ_INFO_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text REPORT_READ_INFO = Text.translatable("gui.chatReport.read_info");
+   private static final Text REPORT_READ_INFO_TEXT = Text.translatable("gui.chatReport.read_info");
    /**
     * @mapping {@literal hashed f_uxivpejt Lnet/minecraft/unmapped/C_eagjljtr;f_uxivpejt:I}
     * @mapping {@literal named FOOTER_HEIGHT Lnet/minecraft/client/gui/screen/AbuseReportScreen;FOOTER_HEIGHT:I}
@@ -89,7 +89,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/AbuseReportScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/client/gui/ChatReportCategory;Ljava/util/function/Consumer;)V}
     */
    public AbuseReportScreen(@Nullable Screen parent, @Nullable ChatReportCategory currentReason, Consumer<ChatReportCategory> reasonSelectedConsumer) {
-      super(ABUSE_REASON_TITLE);
+      super(ABUSE_REASON_TITLE_TEXT);
       this.parent = parent;
       this.currentReason = currentReason;
       this.reasonSelectedConsumer = reasonSelectedConsumer;
@@ -106,7 +106,7 @@
       AbuseReportScreen.ReasonListWidget.Entry lv = Nullables.map(this.currentReason, this.reasonList::getEntry);
       this.reasonList.setSelected(lv);
       int i = this.width / 2 - 150 - 5;
-      this.addDrawableChild(ButtonWidget.builder(REPORT_READ_INFO, button -> this.client.setScreen(new ConfirmLinkScreen(confirmed -> {
+      this.addDrawableChild(ButtonWidget.builder(REPORT_READ_INFO_TEXT, button -> this.client.setScreen(new ConfirmLinkScreen(confirmed -> {
             if (confirmed) {
                Util.getOperatingSystem().open("https://aka.ms/aboutjavareporting");
             }
@@ -135,7 +135,7 @@
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 16, 16777215);
       super.render(graphics, mouseX, mouseY, delta);
       graphics.fill(this.getLeft(), this.getTop(), this.getRight(), this.getBottom(), 2130706432);
-      graphics.drawShadowedText(this.textRenderer, ABUSE_REASON_DESCRIPTION, this.getLeft() + 4, this.getTop() + 4, -8421505);
+      graphics.drawShadowedText(this.textRenderer, ABUSE_REASON_DESCRIPTION_TEXT, this.getLeft() + 4, this.getTop() + 4, -8421505);
       AbuseReportScreen.ReasonListWidget.Entry lv = this.reasonList.getSelectedOrNull();
       if (lv != null) {
          int k = this.getLeft() + 4 + 16;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2023-08-06 01:21:37.138339496 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.java	2023-08-06 01:19:56.616904629 +0000
@@ -28,9 +28,9 @@
 public class AccessibilityOnboardingScreen extends Screen {
    /**
     * @mapping {@literal hashed f_xlzpandj Lnet/minecraft/unmapped/C_lmihmwvx;f_xlzpandj:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ONBOARDING_SCREEN_NARRATOR Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;ONBOARDING_SCREEN_NARRATOR:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ONBOARDING_SCREEN_NARRATOR_TEXT Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;ONBOARDING_SCREEN_NARRATOR_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ONBOARDING_SCREEN_NARRATOR = Text.translatable("accessibility.onboarding.screen.narrator");
+   private static final Text ONBOARDING_SCREEN_NARRATOR_TEXT = Text.translatable("accessibility.onboarding.screen.narrator");
    /**
     * @mapping {@literal hashed f_bhahzogu Lnet/minecraft/unmapped/C_lmihmwvx;f_bhahzogu:I}
     * @mapping {@literal named PADDING Lnet/minecraft/client/gui/screen/AccessibilityOnboardingScreen;PADDING:I}
@@ -174,7 +174,7 @@
          if (this.narratorPromptTimer < 40.0F) {
             ++this.narratorPromptTimer;
          } else if (this.client.isWindowFocused()) {
-            Narrator.getNarrator().say(ONBOARDING_SCREEN_NARRATOR.getString(), true);
+            Narrator.getNarrator().say(ONBOARDING_SCREEN_NARRATOR_TEXT.getString(), true);
             this.narratorPrompted = true;
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/AddServerScreen.java namedSrc/net/minecraft/client/gui/screen/AddServerScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/AddServerScreen.java	2023-08-06 01:21:37.194340302 +0000
+++ namedSrc/net/minecraft/client/gui/screen/AddServerScreen.java	2023-08-06 01:19:56.684905624 +0000
@@ -21,14 +21,14 @@
 public class AddServerScreen extends Screen {
    /**
     * @mapping {@literal hashed f_vihegrru Lnet/minecraft/unmapped/C_iwnqcdds;f_vihegrru:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ENTER_NAME Lnet/minecraft/client/gui/screen/AddServerScreen;ENTER_NAME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ENTER_NAME_TEXT Lnet/minecraft/client/gui/screen/AddServerScreen;ENTER_NAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ENTER_NAME = Text.translatable("addServer.enterName");
+   private static final Text ENTER_NAME_TEXT = Text.translatable("addServer.enterName");
    /**
     * @mapping {@literal hashed f_uypzfgbx Lnet/minecraft/unmapped/C_iwnqcdds;f_uypzfgbx:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ENTER_IP Lnet/minecraft/client/gui/screen/AddServerScreen;ENTER_IP:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ENTER_IP_TEXT Lnet/minecraft/client/gui/screen/AddServerScreen;ENTER_IP_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ENTER_IP = Text.translatable("addServer.enterIp");
+   private static final Text ENTER_IP_TEXT = Text.translatable("addServer.enterIp");
    /**
     * @mapping {@literal hashed f_hwwhmzse Lnet/minecraft/unmapped/C_iwnqcdds;f_hwwhmzse:Lnet/minecraft/unmapped/C_buwziidm;}
     * @mapping {@literal named addButton Lnet/minecraft/client/gui/screen/AddServerScreen;addButton:Lnet/minecraft/client/gui/widget/ButtonWidget;}
@@ -166,8 +166,8 @@
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.renderBackground(graphics);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 17, 16777215);
-      graphics.drawShadowedText(this.textRenderer, ENTER_NAME, this.width / 2 - 100, 53, 10526880);
-      graphics.drawShadowedText(this.textRenderer, ENTER_IP, this.width / 2 - 100, 94, 10526880);
+      graphics.drawShadowedText(this.textRenderer, ENTER_NAME_TEXT, this.width / 2 - 100, 53, 10526880);
+      graphics.drawShadowedText(this.textRenderer, ENTER_IP_TEXT, this.width / 2 - 100, 94, 10526880);
       this.serverNameField.render(graphics, mouseX, mouseY, delta);
       this.addressField.render(graphics, mouseX, mouseY, delta);
       super.render(graphics, mouseX, mouseY, delta);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java	2023-08-06 01:21:37.186340186 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java	2023-08-06 01:19:56.672905449 +0000
@@ -95,19 +95,19 @@
    public static final int BACKGROUND_TILE_COUNT_Y = 7;
    /**
     * @mapping {@literal hashed f_oxzbcqfh Lnet/minecraft/unmapped/C_hejpktqu;f_oxzbcqfh:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SAD_LABEL Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;SAD_LABEL:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SAD_LABEL_TEXT Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;SAD_LABEL_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SAD_LABEL = Text.translatable("advancements.sad_label");
+   private static final Text SAD_LABEL_TEXT = Text.translatable("advancements.sad_label");
    /**
     * @mapping {@literal hashed f_ethrmebw Lnet/minecraft/unmapped/C_hejpktqu;f_ethrmebw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named EMPTY Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;EMPTY:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named EMPTY_TEXT Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;EMPTY_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text EMPTY = Text.translatable("advancements.empty");
+   private static final Text EMPTY_TEXT = Text.translatable("advancements.empty");
    /**
     * @mapping {@literal hashed f_xetahiww Lnet/minecraft/unmapped/C_hejpktqu;f_xetahiww:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ADVANCEMENTS Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;ADVANCEMENTS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ADVANCEMENTS_TEXT Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;ADVANCEMENTS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ADVANCEMENTS = Text.translatable("gui.advancements");
+   private static final Text ADVANCEMENTS_TEXT = Text.translatable("gui.advancements");
    /**
     * @mapping {@literal hashed f_deuzilas Lnet/minecraft/unmapped/C_hejpktqu;f_deuzilas:Lnet/minecraft/unmapped/C_wojlspxv;}
     * @mapping {@literal named advancementHandler Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;advancementHandler:Lnet/minecraft/client/network/ClientAdvancementManager;}
@@ -241,8 +241,8 @@
       if (lv == null) {
          graphics.fill(x + 9, y + 18, x + 9 + 234, y + 18 + 113, -16777216);
          int m = x + 9 + 117;
-         graphics.drawCenteredShadowedText(this.textRenderer, EMPTY, m, y + 18 + 56 - 9 / 2, -1);
-         graphics.drawCenteredShadowedText(this.textRenderer, SAD_LABEL, m, y + 18 + 113 - 9, -1);
+         graphics.drawCenteredShadowedText(this.textRenderer, EMPTY_TEXT, m, y + 18 + 56 - 9 / 2, -1);
+         graphics.drawCenteredShadowedText(this.textRenderer, SAD_LABEL_TEXT, m, y + 18 + 113 - 9, -1);
       } else {
          lv.render(graphics, x + 9, y + 18);
       }
@@ -265,7 +265,7 @@
          }
       }
 
-      graphics.drawText(this.textRenderer, ADVANCEMENTS, x + 8, y + 6, 4210752, false);
+      graphics.drawText(this.textRenderer, ADVANCEMENTS_TEXT, x + 8, y + 6, 4210752, false);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ChatScreen.java namedSrc/net/minecraft/client/gui/screen/ChatScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ChatScreen.java	2023-08-06 01:21:37.122339265 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ChatScreen.java	2023-08-06 01:19:56.596904336 +0000
@@ -31,9 +31,9 @@
    public static final double SHIFT_SCROLL_AMOUNT = 7.0;
    /**
     * @mapping {@literal hashed f_booxreyt Lnet/minecraft/unmapped/C_isjusjcr;f_booxreyt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named USAGE Lnet/minecraft/client/gui/screen/ChatScreen;USAGE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named USAGE_TEXT Lnet/minecraft/client/gui/screen/ChatScreen;USAGE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text USAGE = Text.translatable("chat_screen.usage");
+   private static final Text USAGE_TEXT = Text.translatable("chat_screen.usage");
    /**
     * @mapping {@literal hashed f_bkrzimfk Lnet/minecraft/unmapped/C_isjusjcr;f_bkrzimfk:I}
     * @mapping {@literal named TOOLTIP_MAX_WIDTH Lnet/minecraft/client/gui/screen/ChatScreen;TOOLTIP_MAX_WIDTH:I}
@@ -293,7 +293,7 @@
    @Override
    protected void addScreenNarrations(NarrationMessageBuilder builder) {
       builder.put(NarrationPart.TITLE, this.getTitle());
-      builder.put(NarrationPart.USAGE, USAGE);
+      builder.put(NarrationPart.USAGE, USAGE_TEXT);
       String string = this.chatField.getText();
       if (!string.isEmpty()) {
          builder.nextMessage().put(NarrationPart.TITLE, Text.translatable("chat_screen.message", string));
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-08-06 01:21:37.182340129 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ConnectScreen.java	2023-08-06 01:19:56.664905332 +0000
@@ -56,15 +56,14 @@
     */
    private static final long NARRATOR_INTERVAL = 2000L;
    /**
-    * @mapping {@literal hashed f_ekdyjwbs Lnet/minecraft/unmapped/C_lvjcqlra;f_ekdyjwbs:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CONNECTION_ABORTED Lnet/minecraft/client/gui/screen/ConnectScreen;CONNECTION_ABORTED:Lnet/minecraft/text/Text;}
+    * Mapping not found
     */
-   static final Text CONNECTION_ABORTED = Text.translatable("connect.aborted");
+   static final Text f_ekdyjwbs = Text.translatable("connect.aborted");
    /**
     * @mapping {@literal hashed f_cdxoumew Lnet/minecraft/unmapped/C_lvjcqlra;f_cdxoumew:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named BLOCKED_HOST Lnet/minecraft/client/gui/screen/ConnectScreen;BLOCKED_HOST:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named BLOCKED_HOST_TEXT Lnet/minecraft/client/gui/screen/ConnectScreen;BLOCKED_HOST_TEXT:Lnet/minecraft/text/Text;}
     */
-   public static final Text BLOCKED_HOST = Text.translatable("disconnect.genericReason", Text.translatable("disconnect.unknownHost"));
+   public static final Text BLOCKED_HOST_TEXT = Text.translatable("disconnect.genericReason", Text.translatable("disconnect.unknownHost"));
    /**
     * The client connection to the remote server.
     * This is not used when connecting to the client's own integrated server.
@@ -125,7 +124,7 @@
       if (client.currentScreen instanceof ConnectScreen) {
          LOGGER.error("Attempt to connect while already connecting");
       } else {
-         ConnectScreen lv = new ConnectScreen(screen, quickPlay ? QuickPlay.ERROR : CommonTexts.CONNECT_FAILED);
+         ConnectScreen lv = new ConnectScreen(screen, quickPlay ? QuickPlay.ERROR_TEXT : CommonTexts.CONNECT_FAILED);
          client.disconnect();
          client.startOnlineMode();
          client.setChatReportContext(ReportEnvironment.create(info != null ? info.address : address.getAddress()));
@@ -162,7 +161,7 @@
                if (!optional.isPresent()) {
                   client.execute(
                      () -> client.setScreen(
-                           new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.failureErrorMessage, ConnectScreen.BLOCKED_HOST)
+                           new DisconnectedScreen(ConnectScreen.this.parent, ConnectScreen.this.failureErrorMessage, ConnectScreen.BLOCKED_HOST_TEXT)
                         )
                   );
                   return;
@@ -182,7 +181,7 @@
                ConnectScreen.this.f_unvbqcut.syncUninterruptibly();
                synchronized (ConnectScreen.this) {
                   if (ConnectScreen.this.connectingCancelled) {
-                     lv.disconnect(ConnectScreen.CONNECTION_ABORTED);
+                     lv.disconnect(ConnectScreen.f_ekdyjwbs);
                      return;
                   }
 
@@ -275,7 +274,7 @@
             }
 
             if (this.connection != null) {
-               this.connection.disconnect(CONNECTION_ABORTED);
+               this.connection.disconnect(f_ekdyjwbs);
             }
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CreditsAndAttributionScreen.java namedSrc/net/minecraft/client/gui/screen/CreditsAndAttributionScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CreditsAndAttributionScreen.java	2023-08-06 01:21:37.058338344 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CreditsAndAttributionScreen.java	2023-08-06 01:19:56.520903224 +0000
@@ -33,19 +33,19 @@
    private static final Text TITLE = Text.translatable("credits_and_attribution.screen.title");
    /**
     * @mapping {@literal hashed f_yboocvgu Lnet/minecraft/unmapped/C_dpeyukso;f_yboocvgu:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CREDITS Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;CREDITS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CREDITS_TEXT Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;CREDITS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text CREDITS = Text.translatable("credits_and_attribution.button.credits");
+   private static final Text CREDITS_TEXT = Text.translatable("credits_and_attribution.button.credits");
    /**
     * @mapping {@literal hashed f_ktokozpt Lnet/minecraft/unmapped/C_dpeyukso;f_ktokozpt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ATTRIBUTION Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;ATTRIBUTION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ATTRIBUTION_TEXT Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;ATTRIBUTION_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ATTRIBUTION = Text.translatable("credits_and_attribution.button.attribution");
+   private static final Text ATTRIBUTION_TEXT = Text.translatable("credits_and_attribution.button.attribution");
    /**
     * @mapping {@literal hashed f_fmfmtloh Lnet/minecraft/unmapped/C_dpeyukso;f_fmfmtloh:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named LICENSES Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;LICENSES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named LICENSES_TEXT Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;LICENSES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text LICENSES = Text.translatable("credits_and_attribution.button.licenses");
+   private static final Text LICENSES_TEXT = Text.translatable("credits_and_attribution.button.licenses");
    /**
     * @mapping {@literal hashed f_vztolxlf Lnet/minecraft/unmapped/C_dpeyukso;f_vztolxlf:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/gui/screen/CreditsAndAttributionScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -75,9 +75,11 @@
       GridWidget lv = this.headerFooterWidget.addToContents(new GridWidget()).setSpacing(8);
       lv.getDefaultSettings().alignHorizontallyCenter();
       GridWidget.AdditionHelper lv2 = lv.createAdditionHelper(1);
-      lv2.add(ButtonWidget.builder(CREDITS, button -> this.openCredits()).width(210).build());
-      lv2.add(ButtonWidget.builder(ATTRIBUTION, ConfirmLinkScreen.createPressAction("https://aka.ms/MinecraftJavaAttribution", this, true)).width(210).build());
-      lv2.add(ButtonWidget.builder(LICENSES, ConfirmLinkScreen.createPressAction("https://aka.ms/MinecraftJavaLicenses", this, true)).width(210).build());
+      lv2.add(ButtonWidget.builder(CREDITS_TEXT, button -> this.openCredits()).width(210).build());
+      lv2.add(
+         ButtonWidget.builder(ATTRIBUTION_TEXT, ConfirmLinkScreen.createPressAction("https://aka.ms/MinecraftJavaAttribution", this, true)).width(210).build()
+      );
+      lv2.add(ButtonWidget.builder(LICENSES_TEXT, ConfirmLinkScreen.createPressAction("https://aka.ms/MinecraftJavaLicenses", this, true)).width(210).build());
       this.headerFooterWidget.addToFooter(ButtonWidget.builder(CommonTexts.DONE, button -> this.closeScreen()).build());
       this.headerFooterWidget.arrangeElements();
       this.headerFooterWidget.visitWidgets(this::addDrawableChild);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-08-06 01:21:37.118339208 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeBuffetWorldScreen.java	2023-08-06 01:19:56.588904219 +0000
@@ -30,9 +30,9 @@
 public class CustomizeBuffetWorldScreen extends Screen {
    /**
     * @mapping {@literal hashed f_yygofxdq Lnet/minecraft/unmapped/C_ymxzwktm;f_yygofxdq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named BUFFET_BIOME Lnet/minecraft/client/gui/screen/CustomizeBuffetWorldScreen;BUFFET_BIOME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named BUFFET_BIOME_TEXT Lnet/minecraft/client/gui/screen/CustomizeBuffetWorldScreen;BUFFET_BIOME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text BUFFET_BIOME = Text.translatable("createWorld.customize.buffet.biome");
+   private static final Text BUFFET_BIOME_TEXT = Text.translatable("createWorld.customize.buffet.biome");
    /**
     * @mapping {@literal hashed f_kiwluspf Lnet/minecraft/unmapped/C_ymxzwktm;f_kiwluspf:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/gui/screen/CustomizeBuffetWorldScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -128,7 +128,7 @@
       this.renderBackgroundTexture(graphics);
       this.biomeSelectionList.render(graphics, mouseX, mouseY, delta);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 8, 16777215);
-      graphics.drawCenteredShadowedText(this.textRenderer, BUFFET_BIOME, this.width / 2, 28, 10526880);
+      graphics.drawCenteredShadowedText(this.textRenderer, BUFFET_BIOME_TEXT, this.width / 2, 28, 10526880);
       super.render(graphics, mouseX, mouseY, delta);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DirectConnectScreen.java namedSrc/net/minecraft/client/gui/screen/DirectConnectScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DirectConnectScreen.java	2023-08-06 01:21:37.130339380 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DirectConnectScreen.java	2023-08-06 01:19:56.604904453 +0000
@@ -21,9 +21,9 @@
 public class DirectConnectScreen extends Screen {
    /**
     * @mapping {@literal hashed f_zbrijtmp Lnet/minecraft/unmapped/C_rsrsfniv;f_zbrijtmp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ENTER_IP Lnet/minecraft/client/gui/screen/DirectConnectScreen;ENTER_IP:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ENTER_IP_TEXT Lnet/minecraft/client/gui/screen/DirectConnectScreen;ENTER_IP_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ENTER_IP = Text.translatable("addServer.enterIp");
+   private static final Text ENTER_IP_TEXT = Text.translatable("addServer.enterIp");
    /**
     * @mapping {@literal hashed f_onxhwmhu Lnet/minecraft/unmapped/C_rsrsfniv;f_onxhwmhu:Lnet/minecraft/unmapped/C_buwziidm;}
     * @mapping {@literal named selectServerButton Lnet/minecraft/client/gui/screen/DirectConnectScreen;selectServerButton:Lnet/minecraft/client/gui/widget/ButtonWidget;}
@@ -157,7 +157,7 @@
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.renderBackground(graphics);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 20, 16777215);
-      graphics.drawShadowedText(this.textRenderer, ENTER_IP, this.width / 2 - 100, 100, 10526880);
+      graphics.drawShadowedText(this.textRenderer, ENTER_IP_TEXT, this.width / 2 - 100, 100, 10526880);
       this.addressField.render(graphics, mouseX, mouseY, delta);
       super.render(graphics, mouseX, mouseY, delta);
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2023-08-06 01:21:37.082338690 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DisconnectedScreen.java	2023-08-06 01:19:56.544903575 +0000
@@ -19,14 +19,14 @@
 public class DisconnectedScreen extends Screen {
    /**
     * @mapping {@literal hashed f_yoxllwbe Lnet/minecraft/unmapped/C_mluajnfe;f_yoxllwbe:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TO_MENU Lnet/minecraft/client/gui/screen/DisconnectedScreen;TO_MENU:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TO_MENU_TEXT Lnet/minecraft/client/gui/screen/DisconnectedScreen;TO_MENU_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TO_MENU = Text.translatable("gui.toMenu");
+   private static final Text TO_MENU_TEXT = Text.translatable("gui.toMenu");
    /**
     * @mapping {@literal hashed f_rbokdtcd Lnet/minecraft/unmapped/C_mluajnfe;f_rbokdtcd:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TO_TITLE Lnet/minecraft/client/gui/screen/DisconnectedScreen;TO_TITLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TO_TITLE_TEXT Lnet/minecraft/client/gui/screen/DisconnectedScreen;TO_TITLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TO_TITLE = Text.translatable("gui.toTitle");
+   private static final Text TO_TITLE_TEXT = Text.translatable("gui.toTitle");
    /**
     * @mapping {@literal hashed f_ptxxkyrf Lnet/minecraft/unmapped/C_mluajnfe;f_ptxxkyrf:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/gui/screen/DisconnectedScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -53,7 +53,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/DisconnectedScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;)V}
     */
    public DisconnectedScreen(Screen parent, Text title, Text reason) {
-      this(parent, title, reason, TO_MENU);
+      this(parent, title, reason, TO_MENU_TEXT);
    }
 
    /**
@@ -80,7 +80,7 @@
       if (this.client.isMultiplayerEnabled()) {
          lv2 = ButtonWidget.builder(this.returnText, button -> this.client.setScreen(this.parent)).build();
       } else {
-         lv2 = ButtonWidget.builder(TO_TITLE, button -> this.client.setScreen(new TitleScreen())).build();
+         lv2 = ButtonWidget.builder(TO_TITLE_TEXT, button -> this.client.setScreen(new TitleScreen())).build();
       }
 
       lv.add(lv2);

@github-actions
Copy link

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/3): 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2023-08-06 01:21:37.114339150 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2023-08-06 01:19:56.584904160 +0000
@@ -52,69 +52,69 @@
    private static final int HALF_BUTTON_WIDTH = 98;
    /**
     * @mapping {@literal hashed f_ymykknxo Lnet/minecraft/unmapped/C_gxawvqxt;f_ymykknxo:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named RETURN_TO_GAME Lnet/minecraft/client/gui/screen/GameMenuScreen;RETURN_TO_GAME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named RETURN_TO_GAME_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;RETURN_TO_GAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text RETURN_TO_GAME = Text.translatable("menu.returnToGame");
+   private static final Text RETURN_TO_GAME_TEXT = Text.translatable("menu.returnToGame");
    /**
     * @mapping {@literal hashed f_yzrhtlpn Lnet/minecraft/unmapped/C_gxawvqxt;f_yzrhtlpn:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ADVANCEMENTS Lnet/minecraft/client/gui/screen/GameMenuScreen;ADVANCEMENTS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ADVANCEMENTS_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;ADVANCEMENTS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ADVANCEMENTS = Text.translatable("gui.advancements");
+   private static final Text ADVANCEMENTS_TEXT = Text.translatable("gui.advancements");
    /**
     * @mapping {@literal hashed f_aujtxbsa Lnet/minecraft/unmapped/C_gxawvqxt;f_aujtxbsa:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named STATS Lnet/minecraft/client/gui/screen/GameMenuScreen;STATS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named STATS_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;STATS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text STATS = Text.translatable("gui.stats");
+   private static final Text STATS_TEXT = Text.translatable("gui.stats");
    /**
     * @mapping {@literal hashed f_ekbxlsnv Lnet/minecraft/unmapped/C_gxawvqxt;f_ekbxlsnv:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SEND_FEEDBACK Lnet/minecraft/client/gui/screen/GameMenuScreen;SEND_FEEDBACK:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SEND_FEEDBACK_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;SEND_FEEDBACK_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SEND_FEEDBACK = Text.translatable("menu.sendFeedback");
+   private static final Text SEND_FEEDBACK_TEXT = Text.translatable("menu.sendFeedback");
    /**
     * @mapping {@literal hashed f_rrgefdht Lnet/minecraft/unmapped/C_gxawvqxt;f_rrgefdht:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named REPORT_BUGS Lnet/minecraft/client/gui/screen/GameMenuScreen;REPORT_BUGS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named REPORT_BUGS_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;REPORT_BUGS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text REPORT_BUGS = Text.translatable("menu.reportBugs");
+   private static final Text REPORT_BUGS_TEXT = Text.translatable("menu.reportBugs");
    /**
     * @mapping {@literal hashed f_vjmldoku Lnet/minecraft/unmapped/C_gxawvqxt;f_vjmldoku:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named OPTIONS Lnet/minecraft/client/gui/screen/GameMenuScreen;OPTIONS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named OPTIONS_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;OPTIONS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text OPTIONS = Text.translatable("menu.options");
+   private static final Text OPTIONS_TEXT = Text.translatable("menu.options");
    /**
     * @mapping {@literal hashed f_vvnclzsg Lnet/minecraft/unmapped/C_gxawvqxt;f_vvnclzsg:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SHARE_TO_LAN Lnet/minecraft/client/gui/screen/GameMenuScreen;SHARE_TO_LAN:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SHARE_TO_LAN_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;SHARE_TO_LAN_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SHARE_TO_LAN = Text.translatable("menu.shareToLan");
+   private static final Text SHARE_TO_LAN_TEXT = Text.translatable("menu.shareToLan");
    /**
     * @mapping {@literal hashed f_mmoakwau Lnet/minecraft/unmapped/C_gxawvqxt;f_mmoakwau:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PLAYER_REPORTING Lnet/minecraft/client/gui/screen/GameMenuScreen;PLAYER_REPORTING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PLAYER_REPORTING_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;PLAYER_REPORTING_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PLAYER_REPORTING = Text.translatable("menu.playerReporting");
+   private static final Text PLAYER_REPORTING_TEXT = Text.translatable("menu.playerReporting");
    /**
     * @mapping {@literal hashed f_vslrmggb Lnet/minecraft/unmapped/C_gxawvqxt;f_vslrmggb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named RETURN_TO_MENU Lnet/minecraft/client/gui/screen/GameMenuScreen;RETURN_TO_MENU:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named RETURN_TO_MENU_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;RETURN_TO_MENU_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text RETURN_TO_MENU = Text.translatable("menu.returnToMenu");
+   private static final Text RETURN_TO_MENU_TEXT = Text.translatable("menu.returnToMenu");
    /**
     * @mapping {@literal hashed f_rfurvjny Lnet/minecraft/unmapped/C_gxawvqxt;f_rfurvjny:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named DISCONNECT Lnet/minecraft/client/gui/screen/GameMenuScreen;DISCONNECT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named DISCONNECT_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;DISCONNECT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text DISCONNECT = Text.translatable("menu.disconnect");
+   private static final Text DISCONNECT_TEXT = Text.translatable("menu.disconnect");
    /**
     * @mapping {@literal hashed f_aceckbes Lnet/minecraft/unmapped/C_gxawvqxt;f_aceckbes:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SAVING_WORLD Lnet/minecraft/client/gui/screen/GameMenuScreen;SAVING_WORLD:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SAVING_WORLD_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;SAVING_WORLD_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SAVING_WORLD = Text.translatable("menu.savingLevel");
+   private static final Text SAVING_WORLD_TEXT = Text.translatable("menu.savingLevel");
    /**
     * @mapping {@literal hashed f_pwhoolau Lnet/minecraft/unmapped/C_gxawvqxt;f_pwhoolau:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named GAME Lnet/minecraft/client/gui/screen/GameMenuScreen;GAME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named GAME_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;GAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text GAME = Text.translatable("menu.game");
+   private static final Text GAME_TEXT = Text.translatable("menu.game");
    /**
     * @mapping {@literal hashed f_gbcgghlp Lnet/minecraft/unmapped/C_gxawvqxt;f_gbcgghlp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PAUSED Lnet/minecraft/client/gui/screen/GameMenuScreen;PAUSED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PAUSED_TEXT Lnet/minecraft/client/gui/screen/GameMenuScreen;PAUSED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PAUSED = Text.translatable("menu.paused");
+   private static final Text PAUSED_TEXT = Text.translatable("menu.paused");
    /**
     * @mapping {@literal hashed f_eaeocyul Lnet/minecraft/unmapped/C_gxawvqxt;f_eaeocyul:Z}
     * @mapping {@literal named showMenu Lnet/minecraft/client/gui/screen/GameMenuScreen;showMenu:Z}
@@ -132,7 +132,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/GameMenuScreen;<init>(Z)V}
     */
    public GameMenuScreen(boolean showMenu) {
-      super(showMenu ? GAME : PAUSED);
+      super(showMenu ? GAME_TEXT : PAUSED_TEXT);
       this.showMenu = showMenu;
    }
 
@@ -156,28 +156,29 @@
       GridWidget lv = new GridWidget();
       lv.getDefaultSettings().setPadding(4, 4, 4, 0);
       GridWidget.AdditionHelper lv2 = lv.createAdditionHelper(2);
-      lv2.add(ButtonWidget.builder(RETURN_TO_GAME, button -> {
+      lv2.add(ButtonWidget.builder(RETURN_TO_GAME_TEXT, button -> {
          this.client.setScreen(null);
          this.client.mouse.lockCursor();
       }).width(204).build(), 2, lv.copyDefaultSettings().setTopPadding(50));
-      lv2.add(this.createButton(ADVANCEMENTS, () -> new AdvancementsScreen(this.client.player.networkHandler.getAdvancementHandler())));
-      lv2.add(this.createButton(STATS, () -> new StatsScreen(this, this.client.player.getStatHandler())));
+      lv2.add(this.createButton(ADVANCEMENTS_TEXT, () -> new AdvancementsScreen(this.client.player.networkHandler.getAdvancementHandler())));
+      lv2.add(this.createButton(STATS_TEXT, () -> new StatsScreen(this, this.client.player.getStatHandler())));
       lv2.add(
          this.createLinkConfirmationButton(
-            SEND_FEEDBACK, SharedConstants.getGameVersion().isStable() ? "https://aka.ms/javafeedback?ref=game" : "https://aka.ms/snapshotfeedback?ref=game"
+            SEND_FEEDBACK_TEXT,
+            SharedConstants.getGameVersion().isStable() ? "https://aka.ms/javafeedback?ref=game" : "https://aka.ms/snapshotfeedback?ref=game"
          )
       );
-      lv2.add(this.createLinkConfirmationButton(REPORT_BUGS, "https://aka.ms/snapshotbugs?ref=game")).active = !SharedConstants.getGameVersion()
+      lv2.add(this.createLinkConfirmationButton(REPORT_BUGS_TEXT, "https://aka.ms/snapshotbugs?ref=game")).active = !SharedConstants.getGameVersion()
          .getWorldVersionData()
          .isUnstable();
-      lv2.add(this.createButton(OPTIONS, () -> new OptionsScreen(this, this.client.options)));
+      lv2.add(this.createButton(OPTIONS_TEXT, () -> new OptionsScreen(this, this.client.options)));
       if (this.client.isIntegratedServerRunning() && !this.client.getServer().isRemote()) {
-         lv2.add(this.createButton(SHARE_TO_LAN, () -> new OpenToLanScreen(this)));
+         lv2.add(this.createButton(SHARE_TO_LAN_TEXT, () -> new OpenToLanScreen(this)));
       } else {
-         lv2.add(this.createButton(PLAYER_REPORTING, SocialInteractionsScreen::new));
+         lv2.add(this.createButton(PLAYER_REPORTING_TEXT, SocialInteractionsScreen::new));
       }
 
-      Text lv3 = this.client.isInSingleplayer() ? RETURN_TO_MENU : DISCONNECT;
+      Text lv3 = this.client.isInSingleplayer() ? RETURN_TO_MENU_TEXT : DISCONNECT_TEXT;
       this.reportButton = lv2.add(ButtonWidget.builder(lv3, widget -> {
          widget.active = false;
          this.client.getChatReportingContext().tryShowDraftReportScreen(this.client, this, this::onDisconnect, true);
@@ -196,7 +197,7 @@
       boolean bl2 = this.client.isConnectedToRealms();
       this.client.world.disconnect();
       if (bl) {
-         this.client.disconnect(new GenericMessageScreen(SAVING_WORLD));
+         this.client.disconnect(new GenericMessageScreen(SAVING_WORLD_TEXT));
       } else {
          this.client.disconnect();
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2023-08-06 01:21:37.106339035 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2023-08-06 01:19:56.576904043 +0000
@@ -68,9 +68,9 @@
    private static final int UI_WIDTH = GameModeSelectionScreen.GameMode.values().length * 31 - 5;
    /**
     * @mapping {@literal hashed f_mhuoqnrs Lnet/minecraft/unmapped/C_ghsibibk;f_mhuoqnrs:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SELECT_NEXT Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;SELECT_NEXT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SELECT_NEXT_TEXT Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;SELECT_NEXT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SELECT_NEXT = Text.translatable(
+   private static final Text SELECT_NEXT_TEXT = Text.translatable(
       "debug.gamemodes.select_next", Text.translatable("debug.gamemodes.press_f4").formatted(Formatting.AQUA)
    );
    /**
@@ -157,7 +157,7 @@
          graphics.getMatrices().pop();
          super.render(graphics, mouseX, mouseY, delta);
          graphics.drawCenteredShadowedText(this.textRenderer, this.gameMode.getText(), this.width / 2, this.height / 2 - 31 - 20, -1);
-         graphics.drawCenteredShadowedText(this.textRenderer, SELECT_NEXT, this.width / 2, this.height / 2 + 5, 16777215);
+         graphics.drawCenteredShadowedText(this.textRenderer, SELECT_NEXT_TEXT, this.width / 2, this.height / 2 + 5, 16777215);
          if (!this.mouseUsedForSelection) {
             this.lastMouseX = mouseX;
             this.lastMouseY = mouseY;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java	2023-08-06 01:21:37.098338920 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java	2023-08-06 01:19:56.560903809 +0000
@@ -24,19 +24,19 @@
 public abstract class AbstractCommandBlockScreen extends Screen {
    /**
     * @mapping {@literal hashed f_gaskeqwx Lnet/minecraft/unmapped/C_bcmueeqm;f_gaskeqwx:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SET_COMMAND Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;SET_COMMAND:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SET_COMMAND_TEXT Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;SET_COMMAND_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SET_COMMAND = Text.translatable("advMode.setCommand");
+   private static final Text SET_COMMAND_TEXT = Text.translatable("advMode.setCommand");
    /**
     * @mapping {@literal hashed f_ykxofnyo Lnet/minecraft/unmapped/C_bcmueeqm;f_ykxofnyo:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named COMMAND Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;COMMAND:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named COMMAND_TEXT Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;COMMAND_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text COMMAND = Text.translatable("advMode.command");
+   private static final Text COMMAND_TEXT = Text.translatable("advMode.command");
    /**
     * @mapping {@literal hashed f_wcvhajym Lnet/minecraft/unmapped/C_bcmueeqm;f_wcvhajym:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PREVIOUS_OUTPUT Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;PREVIOUS_OUTPUT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PREVIOUS_OUTPUT_TEXT Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;PREVIOUS_OUTPUT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PREVIOUS_OUTPUT = Text.translatable("advMode.previousOutput");
+   private static final Text PREVIOUS_OUTPUT_TEXT = Text.translatable("advMode.previousOutput");
    /**
     * @mapping {@literal hashed f_ltlwgvaf Lnet/minecraft/unmapped/C_bcmueeqm;f_ltlwgvaf:Lnet/minecraft/unmapped/C_vopzcnhf;}
     * @mapping {@literal named consoleCommandTextField Lnet/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen;consoleCommandTextField:Lnet/minecraft/client/gui/widget/TextFieldWidget;}
@@ -238,13 +238,13 @@
    @Override
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.renderBackground(graphics);
-      graphics.drawCenteredShadowedText(this.textRenderer, SET_COMMAND, this.width / 2, 20, 16777215);
-      graphics.drawShadowedText(this.textRenderer, COMMAND, this.width / 2 - 150, 40, 10526880);
+      graphics.drawCenteredShadowedText(this.textRenderer, SET_COMMAND_TEXT, this.width / 2, 20, 16777215);
+      graphics.drawShadowedText(this.textRenderer, COMMAND_TEXT, this.width / 2 - 150, 40, 10526880);
       this.consoleCommandTextField.render(graphics, mouseX, mouseY, delta);
       int k = 75;
       if (!this.previousOutputTextField.getText().isEmpty()) {
          k += 5 * 9 + 1 + this.getTrackOutputButtonHeight() - 135;
-         graphics.drawShadowedText(this.textRenderer, PREVIOUS_OUTPUT, this.width / 2 - 150, k + 4, 10526880);
+         graphics.drawShadowedText(this.textRenderer, PREVIOUS_OUTPUT_TEXT, this.width / 2 - 150, k + 4, 10526880);
          this.previousOutputTextField.render(graphics, mouseX, mouseY, delta);
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2023-08-06 01:21:37.054338287 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2023-08-06 01:19:56.508903048 +0000
@@ -4,11 +4,10 @@
 import java.util.stream.IntStream;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.SignText;
-import net.minecraft.block.sign.AbstractSignBlock;
-import net.minecraft.block.sign.SignType;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -18,6 +17,7 @@
 import net.minecraft.network.packet.c2s.play.SignUpdateC2SPacket;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.util.SignType;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 import org.lwjgl.glfw.GLFW;
@@ -50,7 +50,7 @@
    private final boolean fromFront;
    /**
     * @mapping {@literal hashed f_xlaqfmub Lnet/minecraft/unmapped/C_dqqnwcwi;f_xlaqfmub:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/block/sign/SignType;}
+    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/util/SignType;}
     */
    protected final SignType signType;
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2023-08-06 01:21:37.178340071 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2023-08-06 01:19:56.656905215 +0000
@@ -29,9 +29,9 @@
    private static final Identifier TEXTURE = new Identifier("textures/gui/container/anvil.png");
    /**
     * @mapping {@literal hashed f_tqvdehce Lnet/minecraft/unmapped/C_tyaycwhf;f_tqvdehce:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TOO_EXPENSIVE Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TOO_EXPENSIVE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TOO_EXPENSIVE_TEXT Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TOO_EXPENSIVE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TOO_EXPENSIVE = Text.translatable("container.repair.expensive");
+   private static final Text TOO_EXPENSIVE_TEXT = Text.translatable("container.repair.expensive");
    /**
     * @mapping {@literal hashed f_nqwuvmuy Lnet/minecraft/unmapped/C_tyaycwhf;f_nqwuvmuy:Lnet/minecraft/unmapped/C_vopzcnhf;}
     * @mapping {@literal named nameField Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;nameField:Lnet/minecraft/client/gui/widget/TextFieldWidget;}
@@ -133,7 +133,7 @@
          int l = 8453920;
          Text lv;
          if (k >= 40 && !this.client.player.getAbilities().creativeMode) {
-            lv = TOO_EXPENSIVE;
+            lv = TOO_EXPENSIVE_TEXT;
             l = 16736352;
          } else if (!this.handler.getSlot(2).hasStack()) {
             lv = null;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2023-08-06 01:21:37.070338517 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2023-08-06 01:19:56.532903399 +0000
@@ -40,14 +40,14 @@
    static final Identifier TEXTURE = new Identifier("textures/gui/container/beacon.png");
    /**
     * @mapping {@literal hashed f_fntfzmlz Lnet/minecraft/unmapped/C_askpskli;f_fntfzmlz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PRIMARY_POWER Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;PRIMARY_POWER:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PRIMARY_POWER_TEXT Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;PRIMARY_POWER_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PRIMARY_POWER = Text.translatable("block.minecraft.beacon.primary");
+   private static final Text PRIMARY_POWER_TEXT = Text.translatable("block.minecraft.beacon.primary");
    /**
     * @mapping {@literal hashed f_gjstuxqv Lnet/minecraft/unmapped/C_askpskli;f_gjstuxqv:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SECONDARY_POWER Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;SECONDARY_POWER:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SECONDARY_POWER_TEXT Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;SECONDARY_POWER_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SECONDARY_POWER = Text.translatable("block.minecraft.beacon.secondary");
+   private static final Text SECONDARY_POWER_TEXT = Text.translatable("block.minecraft.beacon.secondary");
    /**
     * @mapping {@literal hashed f_yylyydci Lnet/minecraft/unmapped/C_askpskli;f_yylyydci:Ljava/util/List;}
     * @mapping {@literal named buttons Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;buttons:Ljava/util/List;}
@@ -165,8 +165,8 @@
     */
    @Override
    protected void drawForeground(GuiGraphics graphics, int mouseX, int mouseY) {
-      graphics.drawCenteredShadowedText(this.textRenderer, PRIMARY_POWER, 62, 10, 14737632);
-      graphics.drawCenteredShadowedText(this.textRenderer, SECONDARY_POWER, 169, 10, 14737632);
+      graphics.drawCenteredShadowedText(this.textRenderer, PRIMARY_POWER_TEXT, 62, 10, 14737632);
+      graphics.drawCenteredShadowedText(this.textRenderer, SECONDARY_POWER_TEXT, 169, 10, 14737632);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2023-08-06 01:21:37.150339668 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2023-08-06 01:19:56.624904746 +0000
@@ -66,24 +66,24 @@
    private static final int HEIGHT = 192;
    /**
     * @mapping {@literal hashed f_kxbnhhor Lnet/minecraft/unmapped/C_thtsxcbc;f_kxbnhhor:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named EDIT_TITLE Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;EDIT_TITLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named EDIT_TITLE_TEXT Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;EDIT_TITLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text EDIT_TITLE = Text.translatable("book.editTitle");
+   private static final Text EDIT_TITLE_TEXT = Text.translatable("book.editTitle");
    /**
     * @mapping {@literal hashed f_llugymrd Lnet/minecraft/unmapped/C_thtsxcbc;f_llugymrd:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named FINALIZE_WARNING Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;FINALIZE_WARNING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named FINALIZE_WARNING_TEXT Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;FINALIZE_WARNING_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text FINALIZE_WARNING = Text.translatable("book.finalizeWarning");
+   private static final Text FINALIZE_WARNING_TEXT = Text.translatable("book.finalizeWarning");
    /**
     * @mapping {@literal hashed f_twlrzveg Lnet/minecraft/unmapped/C_thtsxcbc;f_twlrzveg:Lnet/minecraft/unmapped/C_apvkgwyi;}
-    * @mapping {@literal named BLACK_CURSOR Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;BLACK_CURSOR:Lnet/minecraft/text/OrderedText;}
+    * @mapping {@literal named BLACK_CURSOR_TEXT Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;BLACK_CURSOR_TEXT:Lnet/minecraft/text/OrderedText;}
     */
-   private static final OrderedText BLACK_CURSOR = OrderedText.styledForwardsVisitedString("_", Style.EMPTY.withColor(Formatting.BLACK));
+   private static final OrderedText BLACK_CURSOR_TEXT = OrderedText.styledForwardsVisitedString("_", Style.EMPTY.withColor(Formatting.BLACK));
    /**
     * @mapping {@literal hashed f_zmhitjkp Lnet/minecraft/unmapped/C_thtsxcbc;f_zmhitjkp:Lnet/minecraft/unmapped/C_apvkgwyi;}
-    * @mapping {@literal named GRAY_CURSOR Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;GRAY_CURSOR:Lnet/minecraft/text/OrderedText;}
+    * @mapping {@literal named GRAY_CURSOR_TEXT Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;GRAY_CURSOR_TEXT:Lnet/minecraft/text/OrderedText;}
     */
-   private static final OrderedText GRAY_CURSOR = OrderedText.styledForwardsVisitedString("_", Style.EMPTY.withColor(Formatting.GRAY));
+   private static final OrderedText GRAY_CURSOR_TEXT = OrderedText.styledForwardsVisitedString("_", Style.EMPTY.withColor(Formatting.GRAY));
    /**
     * @mapping {@literal hashed f_ugbdmcga Lnet/minecraft/unmapped/C_thtsxcbc;f_ugbdmcga:Lnet/minecraft/unmapped/C_jzrpycqo;}
     * @mapping {@literal named player Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;player:Lnet/minecraft/entity/player/PlayerEntity;}
@@ -608,14 +608,14 @@
       graphics.drawTexture(BookScreen.BOOK_TEXTURE, k, 2, 0, 0, 192, 192);
       if (this.signing) {
          boolean bl = this.tickCounter / 6 % 2 == 0;
-         OrderedText lv = OrderedText.concat(OrderedText.styledForwardsVisitedString(this.title, Style.EMPTY), bl ? BLACK_CURSOR : GRAY_CURSOR);
-         int m = this.textRenderer.getWidth(EDIT_TITLE);
-         graphics.drawText(this.textRenderer, EDIT_TITLE, k + 36 + (114 - m) / 2, 34, 0, false);
+         OrderedText lv = OrderedText.concat(OrderedText.styledForwardsVisitedString(this.title, Style.EMPTY), bl ? BLACK_CURSOR_TEXT : GRAY_CURSOR_TEXT);
+         int m = this.textRenderer.getWidth(EDIT_TITLE_TEXT);
+         graphics.drawText(this.textRenderer, EDIT_TITLE_TEXT, k + 36 + (114 - m) / 2, 34, 0, false);
          int n = this.textRenderer.getWidth(lv);
          graphics.drawText(this.textRenderer, lv, k + 36 + (114 - n) / 2, 50, 0, false);
          int o = this.textRenderer.getWidth(this.signedByText);
          graphics.drawText(this.textRenderer, this.signedByText, k + 36 + (114 - o) / 2, 60, 0, false);
-         graphics.drawTextWrapped(this.textRenderer, FINALIZE_WARNING, k + 36, 82, 114, 0);
+         graphics.drawTextWrapped(this.textRenderer, FINALIZE_WARNING_TEXT, k + 36, 82, 114, 0);
       } else {
          int p = this.textRenderer.getWidth(this.pageIndicatorText);
          graphics.drawText(this.textRenderer, this.pageIndicatorText, k - p + 192 - 44, 18, 0, false);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2023-08-06 01:21:37.070338517 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2023-08-06 01:19:56.532903399 +0000
@@ -105,9 +105,9 @@
    static final SimpleInventory INVENTORY = new SimpleInventory(45);
    /**
     * @mapping {@literal hashed f_ymquiqem Lnet/minecraft/unmapped/C_hvozqtyu;f_ymquiqem:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named DELETE_ITEM_SLOT Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;DELETE_ITEM_SLOT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named DELETE_ITEM_SLOT_TEXT Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;DELETE_ITEM_SLOT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text DELETE_ITEM_SLOT = Text.translatable("inventory.binSlot");
+   private static final Text DELETE_ITEM_SLOT_TEXT = Text.translatable("inventory.binSlot");
    /**
     * @mapping {@literal hashed f_jgrbhdbj Lnet/minecraft/unmapped/C_hvozqtyu;f_jgrbhdbj:I}
     * @mapping {@literal named WHITE Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;WHITE:I}
@@ -798,7 +798,7 @@
       if (this.deleteItemSlot != null
          && selectedTab.getType() == ItemGroup.Type.INVENTORY
          && this.isPointWithinBounds(this.deleteItemSlot.x, this.deleteItemSlot.y, 16, 16, (double)mouseX, (double)mouseY)) {
-         graphics.drawTooltip(this.textRenderer, DELETE_ITEM_SLOT, mouseX, mouseY);
+         graphics.drawTooltip(this.textRenderer, DELETE_ITEM_SLOT_TEXT, mouseX, mouseY);
       }
 
       this.drawMouseoverTooltip(graphics, mouseX, mouseY);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java	2023-08-06 01:21:37.114339150 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java	2023-08-06 01:19:56.580904102 +0000
@@ -33,29 +33,29 @@
    private static final int MAX_GENERATION_DEPTH = 7;
    /**
     * @mapping {@literal hashed f_blhhyirj Lnet/minecraft/unmapped/C_pjsewajz;f_blhhyirj:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named JOINT_LABEL Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;JOINT_LABEL:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named JOINT_LABEL_TEXT Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;JOINT_LABEL_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text JOINT_LABEL = Text.translatable("jigsaw_block.joint_label");
+   private static final Text JOINT_LABEL_TEXT = Text.translatable("jigsaw_block.joint_label");
    /**
     * @mapping {@literal hashed f_klqkidqq Lnet/minecraft/unmapped/C_pjsewajz;f_klqkidqq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named POOL Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;POOL:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named POOL_TEXT Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;POOL_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text POOL = Text.translatable("jigsaw_block.pool");
+   private static final Text POOL_TEXT = Text.translatable("jigsaw_block.pool");
    /**
     * @mapping {@literal hashed f_fhtyoznm Lnet/minecraft/unmapped/C_pjsewajz;f_fhtyoznm:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named NAME Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;NAME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named NAME_TEXT Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;NAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text NAME = Text.translatable("jigsaw_block.name");
+   private static final Text NAME_TEXT = Text.translatable("jigsaw_block.name");
    /**
     * @mapping {@literal hashed f_lwuwjrxl Lnet/minecraft/unmapped/C_pjsewajz;f_lwuwjrxl:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TARGET Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;TARGET:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TARGET_TEXT Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;TARGET_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TARGET = Text.translatable("jigsaw_block.target");
+   private static final Text TARGET_TEXT = Text.translatable("jigsaw_block.target");
    /**
     * @mapping {@literal hashed f_xlnpttgi Lnet/minecraft/unmapped/C_pjsewajz;f_xlnpttgi:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named FINAL_STATE Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;FINAL_STATE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named FINAL_STATE_TEXT Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;FINAL_STATE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text FINAL_STATE = Text.translatable("jigsaw_block.final_state");
+   private static final Text FINAL_STATE_TEXT = Text.translatable("jigsaw_block.final_state");
    /**
     * @mapping {@literal hashed f_zpgpckjz Lnet/minecraft/unmapped/C_pjsewajz;f_zpgpckjz:Lnet/minecraft/unmapped/C_epwegwuj;}
     * @mapping {@literal named jigsaw Lnet/minecraft/client/gui/screen/ingame/JigsawBlockScreen;jigsaw:Lnet/minecraft/block/entity/JigsawBlockEntity;}
@@ -209,13 +209,13 @@
       this.finalStateField.setText(this.jigsaw.getFinalState());
       this.addSelectableChild(this.finalStateField);
       this.joint = this.jigsaw.getJoint();
-      int i = this.textRenderer.getWidth(JOINT_LABEL) + 10;
+      int i = this.textRenderer.getWidth(JOINT_LABEL_TEXT) + 10;
       this.jointRotationButton = this.addDrawableChild(
          CyclingButtonWidget.<JigsawBlockEntity.Joint>builder(JigsawBlockEntity.Joint::asText)
             .values(JigsawBlockEntity.Joint.values())
             .initially(this.joint)
             .omitKeyText()
-            .build(this.width / 2 - 152 + i, 150, 300 - i, 20, JOINT_LABEL, (button, joint) -> this.joint = joint)
+            .build(this.width / 2 - 152 + i, 150, 300 - i, 20, JOINT_LABEL_TEXT, (button, joint) -> this.joint = joint)
       );
       boolean bl = JigsawBlock.getFacing(this.jigsaw.getCachedState()).getAxis().isVertical();
       this.jointRotationButton.active = bl;
@@ -314,16 +314,16 @@
    @Override
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.renderBackground(graphics);
-      graphics.drawShadowedText(this.textRenderer, POOL, this.width / 2 - 153, 10, 10526880);
+      graphics.drawShadowedText(this.textRenderer, POOL_TEXT, this.width / 2 - 153, 10, 10526880);
       this.poolField.render(graphics, mouseX, mouseY, delta);
-      graphics.drawShadowedText(this.textRenderer, NAME, this.width / 2 - 153, 45, 10526880);
+      graphics.drawShadowedText(this.textRenderer, NAME_TEXT, this.width / 2 - 153, 45, 10526880);
       this.nameField.render(graphics, mouseX, mouseY, delta);
-      graphics.drawShadowedText(this.textRenderer, TARGET, this.width / 2 - 153, 80, 10526880);
+      graphics.drawShadowedText(this.textRenderer, TARGET_TEXT, this.width / 2 - 153, 80, 10526880);
       this.targetField.render(graphics, mouseX, mouseY, delta);
-      graphics.drawShadowedText(this.textRenderer, FINAL_STATE, this.width / 2 - 153, 115, 10526880);
+      graphics.drawShadowedText(this.textRenderer, FINAL_STATE_TEXT, this.width / 2 - 153, 115, 10526880);
       this.finalStateField.render(graphics, mouseX, mouseY, delta);
       if (JigsawBlock.getFacing(this.jigsaw.getCachedState()).getAxis().isVertical()) {
-         graphics.drawShadowedText(this.textRenderer, JOINT_LABEL, this.width / 2 - 153, 156, 16777215);
+         graphics.drawShadowedText(this.textRenderer, JOINT_LABEL_TEXT, this.width / 2 - 153, 156, 16777215);
       }
 
       super.render(graphics, mouseX, mouseY, delta);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java	2023-08-06 01:21:37.154339726 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java	2023-08-06 01:19:56.632904863 +0000
@@ -120,19 +120,19 @@
    private static final int SCROLLBAR_OFFSET_X = 94;
    /**
     * @mapping {@literal hashed f_kxlyxlfa Lnet/minecraft/unmapped/C_ymlucuqe;f_kxlyxlfa:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TRADES Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TRADES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TRADES_TEXT Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TRADES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TRADES = Text.translatable("merchant.trades");
+   private static final Text TRADES_TEXT = Text.translatable("merchant.trades");
    /**
     * @mapping {@literal hashed f_amoywyoy Lnet/minecraft/unmapped/C_ymlucuqe;f_amoywyoy:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SEPARATOR Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;SEPARATOR:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SEPARATOR_TEXT Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;SEPARATOR_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SEPARATOR = Text.literal(" - ");
+   private static final Text SEPARATOR_TEXT = Text.literal(" - ");
    /**
     * @mapping {@literal hashed f_odpvjist Lnet/minecraft/unmapped/C_ymlucuqe;f_odpvjist:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named DEPRECATED Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;DEPRECATED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named DEPRECATED_TEXT Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;DEPRECATED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text DEPRECATED = Text.translatable("merchant.deprecated");
+   private static final Text DEPRECATED_TEXT = Text.translatable("merchant.deprecated");
    /**
     * @mapping {@literal hashed f_adgarvcj Lnet/minecraft/unmapped/C_ymlucuqe;f_adgarvcj:I}
     * @mapping {@literal named selectedIndex Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;selectedIndex:I}
@@ -202,7 +202,7 @@
    protected void drawForeground(GuiGraphics graphics, int mouseX, int mouseY) {
       int k = this.handler.getLevelProgress();
       if (k > 0 && k <= 5 && this.handler.isLeveled()) {
-         Text lv = this.title.copy().append(SEPARATOR).append(Text.translatable("merchant.level." + k));
+         Text lv = this.title.copy().append(SEPARATOR_TEXT).append(Text.translatable("merchant.level." + k));
          int l = this.textRenderer.getWidth(lv);
          int m = 49 + this.backgroundWidth / 2 - l / 2;
          graphics.drawText(this.textRenderer, lv, m, 6, 4210752, false);
@@ -211,8 +211,8 @@
       }
 
       graphics.drawText(this.textRenderer, this.playerInventoryTitle, this.playerInventoryTitleX, this.playerInventoryTitleY, 4210752, false);
-      int n = this.textRenderer.getWidth(TRADES);
-      graphics.drawText(this.textRenderer, TRADES, 5 - n / 2 + 48, 6, 4210752, false);
+      int n = this.textRenderer.getWidth(TRADES_TEXT);
+      graphics.drawText(this.textRenderer, TRADES_TEXT, 5 - n / 2 + 48, 6, 4210752, false);
    }
 
    /**
@@ -331,7 +331,7 @@
          }
 
          if (lv7.isDisabled() && this.isPointWithinBounds(186, 35, 22, 21, (double)mouseX, (double)mouseY) && this.handler.canRefreshTrades()) {
-            graphics.drawTooltip(this.textRenderer, DEPRECATED, mouseX, mouseY);
+            graphics.drawTooltip(this.textRenderer, DEPRECATED_TEXT, mouseX, mouseY);
          }
 
          for (MerchantScreen.WidgetButtonPage lv8 : this.offers) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java	2023-08-06 01:21:37.194340302 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SignEditScreen.java	2023-08-06 01:19:56.688905683 +0000
@@ -4,8 +4,8 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.SignBlock;
 import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.block.sign.SignBlock;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.TexturedRenderLayers;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2023-08-06 01:21:37.138339496 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2023-08-06 01:19:56.616904629 +0000
@@ -42,14 +42,14 @@
    private static final Identifier EMPTY_SLOT_NETHERITE_UPGRADE = new Identifier("item/empty_slot_smithing_template_netherite_upgrade");
    /**
     * @mapping {@literal hashed f_sprkuntq Lnet/minecraft/unmapped/C_ktalreqx;f_sprkuntq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named MISSING_TEMPLATE_TOOLTIP Lnet/minecraft/client/gui/screen/ingame/SmithingScreen;MISSING_TEMPLATE_TOOLTIP:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named MISSING_TEMPLATE_TOOLTIP_TEXT Lnet/minecraft/client/gui/screen/ingame/SmithingScreen;MISSING_TEMPLATE_TOOLTIP_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text MISSING_TEMPLATE_TOOLTIP = Text.translatable("container.upgrade.missing_template_tooltip");
+   private static final Text MISSING_TEMPLATE_TOOLTIP_TEXT = Text.translatable("container.upgrade.missing_template_tooltip");
    /**
     * @mapping {@literal hashed f_xtkpzwbf Lnet/minecraft/unmapped/C_ktalreqx;f_xtkpzwbf:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named UPGRADE_ERROR_TOOLTIP Lnet/minecraft/client/gui/screen/ingame/SmithingScreen;UPGRADE_ERROR_TOOLTIP:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named UPGRADE_ERROR_TOOLTIP_TEXT Lnet/minecraft/client/gui/screen/ingame/SmithingScreen;UPGRADE_ERROR_TOOLTIP_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text UPGRADE_ERROR_TOOLTIP = Text.translatable("container.upgrade.error_tooltip");
+   private static final Text UPGRADE_ERROR_TOOLTIP_TEXT = Text.translatable("container.upgrade.error_tooltip");
    /**
     * @mapping {@literal hashed f_fbvnoyie Lnet/minecraft/unmapped/C_ktalreqx;f_fbvnoyie:Ljava/util/List;}
     * @mapping {@literal named TEMPLATE_SLOT_TEXTURES Lnet/minecraft/client/gui/screen/ingame/SmithingScreen;TEMPLATE_SLOT_TEXTURES:Ljava/util/List;}
@@ -265,7 +265,7 @@
    private void renderTooltips(GuiGraphics graphics, int mouseX, int mouseY) {
       Optional<Text> optional = Optional.empty();
       if (this.isRecipeError() && this.isPointWithinBounds(65, 46, 28, 21, (double)mouseX, (double)mouseY)) {
-         optional = Optional.of(UPGRADE_ERROR_TOOLTIP);
+         optional = Optional.of(UPGRADE_ERROR_TOOLTIP_TEXT);
       }
 
       if (this.focusedSlot != null) {
@@ -273,7 +273,7 @@
          ItemStack lv2 = this.focusedSlot.getStack();
          if (lv.isEmpty()) {
             if (this.focusedSlot.id == 0) {
-               optional = Optional.of(MISSING_TEMPLATE_TOOLTIP);
+               optional = Optional.of(MISSING_TEMPLATE_TOOLTIP_TEXT);
             }
          } else {
             Item var8 = lv.getItem();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.java	2023-08-06 01:21:37.122339265 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.java	2023-08-06 01:19:56.592904278 +0000
@@ -32,49 +32,49 @@
 public class StructureBlockScreen extends Screen {
    /**
     * @mapping {@literal hashed f_fyxwuvvm Lnet/minecraft/unmapped/C_svzcwkmk;f_fyxwuvvm:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named STRUCTURE_NAME Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;STRUCTURE_NAME:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named STRUCTURE_NAME_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;STRUCTURE_NAME_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text STRUCTURE_NAME = Text.translatable("structure_block.structure_name");
+   private static final Text STRUCTURE_NAME_TEXT = Text.translatable("structure_block.structure_name");
    /**
     * @mapping {@literal hashed f_jelmayuk Lnet/minecraft/unmapped/C_svzcwkmk;f_jelmayuk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named POSITION Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;POSITION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named POSITION_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;POSITION_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text POSITION = Text.translatable("structure_block.position");
+   private static final Text POSITION_TEXT = Text.translatable("structure_block.position");
    /**
     * @mapping {@literal hashed f_ymgfuius Lnet/minecraft/unmapped/C_svzcwkmk;f_ymgfuius:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SIZE Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SIZE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SIZE_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SIZE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SIZE = Text.translatable("structure_block.size");
+   private static final Text SIZE_TEXT = Text.translatable("structure_block.size");
    /**
     * @mapping {@literal hashed f_dbyeisww Lnet/minecraft/unmapped/C_svzcwkmk;f_dbyeisww:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named INTEGRITY Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;INTEGRITY:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named INTEGRITY_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;INTEGRITY_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text INTEGRITY = Text.translatable("structure_block.integrity");
+   private static final Text INTEGRITY_TEXT = Text.translatable("structure_block.integrity");
    /**
     * @mapping {@literal hashed f_xjpzxtce Lnet/minecraft/unmapped/C_svzcwkmk;f_xjpzxtce:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CUSTOM_DATA Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;CUSTOM_DATA:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CUSTOM_DATA_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;CUSTOM_DATA_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text CUSTOM_DATA = Text.translatable("structure_block.custom_data");
+   private static final Text CUSTOM_DATA_TEXT = Text.translatable("structure_block.custom_data");
    /**
     * @mapping {@literal hashed f_rgjdvdxx Lnet/minecraft/unmapped/C_svzcwkmk;f_rgjdvdxx:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named INCLUDE_ENTITIES Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;INCLUDE_ENTITIES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named INCLUDE_ENTITIES_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;INCLUDE_ENTITIES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text INCLUDE_ENTITIES = Text.translatable("structure_block.include_entities");
+   private static final Text INCLUDE_ENTITIES_TEXT = Text.translatable("structure_block.include_entities");
    /**
     * @mapping {@literal hashed f_qiyscjfb Lnet/minecraft/unmapped/C_svzcwkmk;f_qiyscjfb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named DETECT_SIZE Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;DETECT_SIZE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named DETECT_SIZE_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;DETECT_SIZE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text DETECT_SIZE = Text.translatable("structure_block.detect_size");
+   private static final Text DETECT_SIZE_TEXT = Text.translatable("structure_block.detect_size");
    /**
     * @mapping {@literal hashed f_grnifdvb Lnet/minecraft/unmapped/C_svzcwkmk;f_grnifdvb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SHOW_AIR Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SHOW_AIR:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SHOW_AIR_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SHOW_AIR_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SHOW_AIR = Text.translatable("structure_block.show_air");
+   private static final Text SHOW_AIR_TEXT = Text.translatable("structure_block.show_air");
    /**
     * @mapping {@literal hashed f_fgdunanl Lnet/minecraft/unmapped/C_svzcwkmk;f_fgdunanl:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SHOW_BOUNDING_BOX Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SHOW_BOUNDING_BOX:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SHOW_BOUNDING_BOX_TEXT Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;SHOW_BOUNDING_BOX_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SHOW_BOUNDING_BOX = Text.translatable("structure_block.show_boundingbox");
+   private static final Text SHOW_BOUNDING_BOX_TEXT = Text.translatable("structure_block.show_boundingbox");
    /**
     * @mapping {@literal hashed f_jjmoxbfb Lnet/minecraft/unmapped/C_svzcwkmk;f_jjmoxbfb:Lcom/google/common/collect/ImmutableList;}
     * @mapping {@literal named MODES Lnet/minecraft/client/gui/screen/ingame/StructureBlockScreen;MODES:Lcom/google/common/collect/ImmutableList;}
@@ -329,7 +329,12 @@
          CyclingButtonWidget.onOffBuilder(!this.structureBlock.shouldIgnoreEntities())
             .omitKeyText()
             .build(
-               this.width / 2 + 4 + 100, 160, 50, 20, INCLUDE_ENTITIES, (button, includeEntities) -> this.structureBlock.setIgnoreEntities(!includeEntities)
+               this.width / 2 + 4 + 100,
+               160,
+               50,
+               20,
+               INCLUDE_ENTITIES_TEXT,
+               (button, includeEntities) -> this.structureBlock.setIgnoreEntities(!includeEntities)
             )
       );
       this.buttonMirror = this.addDrawableChild(
@@ -342,13 +347,18 @@
       this.buttonShowAir = this.addDrawableChild(
          CyclingButtonWidget.onOffBuilder(this.structureBlock.shouldShowAir())
             .omitKeyText()
-            .build(this.width / 2 + 4 + 100, 80, 50, 20, SHOW_AIR, (button, showAir) -> this.structureBlock.setShowAir(showAir))
+            .build(this.width / 2 + 4 + 100, 80, 50, 20, SHOW_AIR_TEXT, (button, showAir) -> this.structureBlock.setShowAir(showAir))
       );
       this.buttonShowBoundingBox = this.addDrawableChild(
          CyclingButtonWidget.onOffBuilder(this.structureBlock.shouldShowBoundingBox())
             .omitKeyText()
             .build(
-               this.width / 2 + 4 + 100, 80, 50, 20, SHOW_BOUNDING_BOX, (button, showBoundingBox) -> this.structureBlock.setShowBoundingBox(showBoundingBox)
+               this.width / 2 + 4 + 100,
+               80,
+               50,
+               20,
+               SHOW_BOUNDING_BOX_TEXT,
+               (button, showBoundingBox) -> this.structureBlock.setShowBoundingBox(showBoundingBox)
             )
       );
       this.buttonRotate0 = this.addDrawableChild(ButtonWidget.builder(Text.literal("0"), button -> {
@@ -639,36 +649,40 @@
       StructureBlockMode lv = this.structureBlock.getMode();
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 10, 16777215);
       if (lv != StructureBlockMode.DATA) {
-         graphics.drawShadowedText(this.textRenderer, STRUCTURE_NAME, this.width / 2 - 153, 30, 10526880);
+         graphics.drawShadowedText(this.textRenderer, STRUCTURE_NAME_TEXT, this.width / 2 - 153, 30, 10526880);
          this.inputName.render(graphics, mouseX, mouseY, delta);
       }
 
       if (lv == StructureBlockMode.LOAD || lv == StructureBlockMode.SAVE) {
-         graphics.drawShadowedText(this.textRenderer, POSITION, this.width / 2 - 153, 70, 10526880);
+         graphics.drawShadowedText(this.textRenderer, POSITION_TEXT, this.width / 2 - 153, 70, 10526880);
          this.inputPosX.render(graphics, mouseX, mouseY, delta);
          this.inputPosY.render(graphics, mouseX, mouseY, delta);
          this.inputPosZ.render(graphics, mouseX, mouseY, delta);
-         graphics.drawShadowedText(this.textRenderer, INCLUDE_ENTITIES, this.width / 2 + 154 - this.textRenderer.getWidth(INCLUDE_ENTITIES), 150, 10526880);
+         graphics.drawShadowedText(
+            this.textRenderer, INCLUDE_ENTITIES_TEXT, this.width / 2 + 154 - this.textRenderer.getWidth(INCLUDE_ENTITIES_TEXT), 150, 10526880
+         );
       }
 
       if (lv == StructureBlockMode.SAVE) {
-         graphics.drawShadowedText(this.textRenderer, SIZE, this.width / 2 - 153, 110, 10526880);
+         graphics.drawShadowedText(this.textRenderer, SIZE_TEXT, this.width / 2 - 153, 110, 10526880);
          this.inputSizeX.render(graphics, mouseX, mouseY, delta);
          this.inputSizeY.render(graphics, mouseX, mouseY, delta);
          this.inputSizeZ.render(graphics, mouseX, mouseY, delta);
-         graphics.drawShadowedText(this.textRenderer, DETECT_SIZE, this.width / 2 + 154 - this.textRenderer.getWidth(DETECT_SIZE), 110, 10526880);
-         graphics.drawShadowedText(this.textRenderer, SHOW_AIR, this.width / 2 + 154 - this.textRenderer.getWidth(SHOW_AIR), 70, 10526880);
+         graphics.drawShadowedText(this.textRenderer, DETECT_SIZE_TEXT, this.width / 2 + 154 - this.textRenderer.getWidth(DETECT_SIZE_TEXT), 110, 10526880);
+         graphics.drawShadowedText(this.textRenderer, SHOW_AIR_TEXT, this.width / 2 + 154 - this.textRenderer.getWidth(SHOW_AIR_TEXT), 70, 10526880);
       }
 
       if (lv == StructureBlockMode.LOAD) {
-         graphics.drawShadowedText(this.textRenderer, INTEGRITY, this.width / 2 - 153, 110, 10526880);
+         graphics.drawShadowedText(this.textRenderer, INTEGRITY_TEXT, this.width / 2 - 153, 110, 10526880);
          this.inputIntegrity.render(graphics, mouseX, mouseY, delta);
          this.inputSeed.render(graphics, mouseX, mouseY, delta);
-         graphics.drawShadowedText(this.textRenderer, SHOW_BOUNDING_BOX, this.width / 2 + 154 - this.textRenderer.getWidth(SHOW_BOUNDING_BOX), 70, 10526880);
+         graphics.drawShadowedText(
+            this.textRenderer, SHOW_BOUNDING_BOX_TEXT, this.width / 2 + 154 - this.textRenderer.getWidth(SHOW_BOUNDING_BOX_TEXT), 70, 10526880
+         );
       }
 
       if (lv == StructureBlockMode.DATA) {
-         graphics.drawShadowedText(this.textRenderer, CUSTOM_DATA, this.width / 2 - 153, 110, 10526880);
+         graphics.drawShadowedText(this.textRenderer, CUSTOM_DATA_TEXT, this.width / 2 - 153, 110, 10526880);
          this.inputMetadata.render(graphics, mouseX, mouseY, delta);
       }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ChatReportScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatReportScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ChatReportScreen.java	2023-08-06 01:21:37.066338459 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatReportScreen.java	2023-08-06 01:19:56.528903341 +0000
@@ -71,24 +71,24 @@
    private static final int SCREEN_HEIGHT = 300;
    /**
     * @mapping {@literal hashed f_scunmoth Lnet/minecraft/unmapped/C_oibiknor;f_scunmoth:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named OBSERVED_WHAT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;OBSERVED_WHAT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named OBSERVED_WHAT_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;OBSERVED_WHAT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text OBSERVED_WHAT = Text.translatable("gui.chatReport.observed_what");
+   private static final Text OBSERVED_WHAT_TEXT = Text.translatable("gui.chatReport.observed_what");
    /**
     * @mapping {@literal hashed f_wcjipxwq Lnet/minecraft/unmapped/C_oibiknor;f_wcjipxwq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SELECT_REASON Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SELECT_REASON:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SELECT_REASON_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SELECT_REASON_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SELECT_REASON = Text.translatable("gui.chatReport.select_reason");
+   private static final Text SELECT_REASON_TEXT = Text.translatable("gui.chatReport.select_reason");
    /**
     * @mapping {@literal hashed f_lhzbbvtv Lnet/minecraft/unmapped/C_oibiknor;f_lhzbbvtv:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named MORE_COMMENTS Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;MORE_COMMENTS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named MORE_COMMENTS_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;MORE_COMMENTS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text MORE_COMMENTS = Text.translatable("gui.chatReport.more_comments");
+   private static final Text MORE_COMMENTS_TEXT = Text.translatable("gui.chatReport.more_comments");
    /**
     * @mapping {@literal hashed f_pnlpetvs Lnet/minecraft/unmapped/C_oibiknor;f_pnlpetvs:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named DESCRIBE Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;DESCRIBE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named DESCRIBE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;DESCRIBE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text DESCRIBE = Text.translatable("gui.chatReport.describe");
+   private static final Text DESCRIBE_TEXT = Text.translatable("gui.chatReport.describe");
    /**
     * @mapping {@literal hashed f_zynnxgrw Lnet/minecraft/unmapped/C_oibiknor;f_zynnxgrw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named REPORT_SENT_MESSAGE Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;REPORT_SENT_MESSAGE:Lnet/minecraft/text/Text;}
@@ -96,9 +96,9 @@
    private static final Text REPORT_SENT_MESSAGE = Text.translatable("gui.chatReport.report_sent_msg");
    /**
     * @mapping {@literal hashed f_dgljxyga Lnet/minecraft/unmapped/C_oibiknor;f_dgljxyga:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SELECT_CHAT_MESSAGES Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SELECT_CHAT_MESSAGES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SELECT_CHAT_MESSAGES_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SELECT_CHAT_MESSAGES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SELECT_CHAT_MESSAGES = Text.translatable("gui.chatReport.select_chat");
+   private static final Text SELECT_CHAT_MESSAGES_TEXT = Text.translatable("gui.chatReport.select_chat");
    /**
     * @mapping {@literal hashed f_ipzooosy Lnet/minecraft/unmapped/C_oibiknor;f_ipzooosy:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named SENDING_REPORT_TITLE Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SENDING_REPORT_TITLE:Lnet/minecraft/text/Text;}
@@ -116,9 +116,9 @@
    private static final Text SEND_REPORT_ERROR_TITLE = Text.translatable("gui.abuseReport.error.title").formatted(Formatting.BOLD);
    /**
     * @mapping {@literal hashed f_wjhdiagb Lnet/minecraft/unmapped/C_oibiknor;f_wjhdiagb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SEND_GENERIC_ERROR Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SEND_GENERIC_ERROR:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SEND_GENERIC_ERROR_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;SEND_GENERIC_ERROR_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SEND_GENERIC_ERROR = Text.translatable("gui.abuseReport.send.generic_error");
+   private static final Text SEND_GENERIC_ERROR_TEXT = Text.translatable("gui.abuseReport.send.generic_error");
    /**
     * @mapping {@literal hashed f_atfjrmxe Lnet/minecraft/unmapped/C_oibiknor;f_atfjrmxe:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen;LOGGER:Lorg/slf4j/Logger;}
@@ -208,7 +208,7 @@
       IntSet intSet = this.reportBuilder.getSelectedMessages();
       Text lv2;
       if (intSet.isEmpty()) {
-         lv2 = SELECT_CHAT_MESSAGES;
+         lv2 = SELECT_CHAT_MESSAGES_TEXT;
       } else {
          lv2 = Text.translatable("gui.chatReport.selected_chat", intSet.size());
       }
@@ -219,7 +219,7 @@
                this.refreshValidity();
             }))).positionAndSize(this.getWidgetsLeftX(), this.getSelectionButtonY(), 280, 20).build()
       );
-      Text lv4 = Nullables.mapOrDefault(lv, ChatReportCategory::getDisplayName, SELECT_REASON);
+      Text lv4 = Nullables.mapOrDefault(lv, ChatReportCategory::getDisplayName, SELECT_REASON_TEXT);
       this.addDrawableChild(
          ButtonWidget.builder(lv4, button -> this.client.setScreen(new AbuseReportScreen(this, this.reportBuilder.getCategory(), category -> {
                this.reportBuilder.setCategory(category);
@@ -233,7 +233,7 @@
             this.getEditBoxTop(),
             280,
             this.getEditBoxBottom() - this.getEditBoxTop(),
-            DESCRIBE,
+            DESCRIBE_TEXT,
             Text.translatable("gui.chatReport.comments")
          )
       );
@@ -311,7 +311,7 @@
       if (var4 instanceof TextifiedException lv) {
          lv2 = lv.getMessageText();
       } else {
-         lv2 = SEND_GENERIC_ERROR;
+         lv2 = SEND_GENERIC_ERROR_TEXT;
       }
 
       this.displayError(lv2);
@@ -352,12 +352,12 @@
       int k = this.width / 2;
       this.renderBackground(graphics);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, k, 10, 16777215);
-      graphics.drawCenteredShadowedText(this.textRenderer, OBSERVED_WHAT, k, this.getSelectionButtonY() - 9 - 6, 16777215);
+      graphics.drawCenteredShadowedText(this.textRenderer, OBSERVED_WHAT_TEXT, k, this.getSelectionButtonY() - 9 - 6, 16777215);
       if (this.reasonDescription != null) {
          this.reasonDescription.drawWithShadow(graphics, this.getWidgetsLeftX(), this.getReasonButtonY() + 20 + 5, 9, 16777215);
       }
 
-      graphics.drawShadowedText(this.textRenderer, MORE_COMMENTS, this.getWidgetsLeftX(), this.getEditBoxTop() - 9 - 6, 16777215);
+      graphics.drawShadowedText(this.textRenderer, MORE_COMMENTS_TEXT, this.getWidgetsLeftX(), this.getEditBoxTop() - 9 - 6, 16777215);
       super.render(graphics, mouseX, mouseY, delta);
    }
 
@@ -494,19 +494,19 @@
       private static final Text MESSAGE = Text.translatable("gui.chatReport.discard.content");
       /**
        * @mapping {@literal hashed f_xmvnojtw Lnet/minecraft/unmapped/C_oibiknor$C_pbmprlyb;f_xmvnojtw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-       * @mapping {@literal named RETURN Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;RETURN:Lnet/minecraft/text/Text;}
+       * @mapping {@literal named RETURN_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;RETURN_TEXT:Lnet/minecraft/text/Text;}
        */
-      private static final Text RETURN = Text.translatable("gui.chatReport.discard.return");
+      private static final Text RETURN_TEXT = Text.translatable("gui.chatReport.discard.return");
       /**
        * @mapping {@literal hashed f_gjgodtih Lnet/minecraft/unmapped/C_oibiknor$C_pbmprlyb;f_gjgodtih:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-       * @mapping {@literal named DRAFT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;DRAFT:Lnet/minecraft/text/Text;}
+       * @mapping {@literal named DRAFT_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;DRAFT_TEXT:Lnet/minecraft/text/Text;}
        */
-      private static final Text DRAFT = Text.translatable("gui.chatReport.discard.draft");
+      private static final Text DRAFT_TEXT = Text.translatable("gui.chatReport.discard.draft");
       /**
        * @mapping {@literal hashed f_dfjtocni Lnet/minecraft/unmapped/C_oibiknor$C_pbmprlyb;f_dfjtocni:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-       * @mapping {@literal named DISCARD Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;DISCARD:Lnet/minecraft/text/Text;}
+       * @mapping {@literal named DISCARD_TEXT Lnet/minecraft/client/gui/screen/multiplayer/ChatReportScreen$DiscardReportScreen;DISCARD_TEXT:Lnet/minecraft/text/Text;}
        */
-      private static final Text DISCARD = Text.translatable("gui.chatReport.discard.discard");
+      private static final Text DISCARD_TEXT = Text.translatable("gui.chatReport.discard.discard");
 
       /**
        * Mapping not found
@@ -522,13 +522,13 @@
       protected void initButtons(int textHeight) {
          int j = 150;
          this.addDrawableChild(
-            ButtonWidget.builder(RETURN, button -> this.closeScreen()).positionAndSize(this.width / 2 - 155, 100 + textHeight, 150, 20).build()
+            ButtonWidget.builder(RETURN_TEXT, button -> this.closeScreen()).positionAndSize(this.width / 2 - 155, 100 + textHeight, 150, 20).build()
          );
-         this.addDrawableChild(ButtonWidget.builder(DRAFT, button -> {
+         this.addDrawableChild(ButtonWidget.builder(DRAFT_TEXT, button -> {
             ChatReportScreen.this.saveDraft();
             this.client.setScreen(ChatReportScreen.this.parent);
          }).positionAndSize(this.width / 2 + 5, 100 + textHeight, 150, 20).build());
-         this.addDrawableChild(ButtonWidget.builder(DISCARD, button -> {
+         this.addDrawableChild(ButtonWidget.builder(DISCARD_TEXT, button -> {
             ChatReportScreen.this.removeDraftReport();
             this.client.setScreen(ChatReportScreen.this.parent);
          }).positionAndSize(this.width / 2 - 75, 130 + textHeight, 150, 20).build());
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java	2023-08-06 01:21:37.126339323 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java	2023-08-06 01:19:56.600904395 +0000
@@ -71,39 +71,39 @@
    static final Identifier ICONS = new Identifier("textures/gui/icons.png");
    /**
     * @mapping {@literal hashed f_wqhnysrt Lnet/minecraft/unmapped/C_iwaoijqa;f_wqhnysrt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named LAN_SCANNING Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;LAN_SCANNING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named LAN_SCANNING_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;LAN_SCANNING_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text LAN_SCANNING = Text.translatable("lanServer.scanning");
+   static final Text LAN_SCANNING_TEXT = Text.translatable("lanServer.scanning");
    /**
     * @mapping {@literal hashed f_fqhtibgs Lnet/minecraft/unmapped/C_iwaoijqa;f_fqhtibgs:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CANNOT_RESOLVE Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;CANNOT_RESOLVE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CANNOT_RESOLVE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;CANNOT_RESOLVE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text CANNOT_RESOLVE = Text.translatable("multiplayer.status.cannot_resolve").styled(style -> style.withColor(-65536));
+   static final Text CANNOT_RESOLVE_TEXT = Text.translatable("multiplayer.status.cannot_resolve").styled(style -> style.withColor(-65536));
    /**
     * @mapping {@literal hashed f_jgbuuadj Lnet/minecraft/unmapped/C_iwaoijqa;f_jgbuuadj:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CANNOT_CONNECT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;CANNOT_CONNECT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CANNOT_CONNECT_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;CANNOT_CONNECT_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text CANNOT_CONNECT = Text.translatable("multiplayer.status.cannot_connect").styled(style -> style.withColor(-65536));
+   static final Text CANNOT_CONNECT_TEXT = Text.translatable("multiplayer.status.cannot_connect").styled(style -> style.withColor(-65536));
    /**
     * @mapping {@literal hashed f_zwpnxaqs Lnet/minecraft/unmapped/C_iwaoijqa;f_zwpnxaqs:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named INCOMPATIBLE Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;INCOMPATIBLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named INCOMPATIBLE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;INCOMPATIBLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text INCOMPATIBLE = Text.translatable("multiplayer.status.incompatible");
+   static final Text INCOMPATIBLE_TEXT = Text.translatable("multiplayer.status.incompatible");
    /**
     * @mapping {@literal hashed f_uiyyunkq Lnet/minecraft/unmapped/C_iwaoijqa;f_uiyyunkq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named NO_CONNECTION Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;NO_CONNECTION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named NO_CONNECTION_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;NO_CONNECTION_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text NO_CONNECTION = Text.translatable("multiplayer.status.no_connection");
+   static final Text NO_CONNECTION_TEXT = Text.translatable("multiplayer.status.no_connection");
    /**
     * @mapping {@literal hashed f_gmgybwnq Lnet/minecraft/unmapped/C_iwaoijqa;f_gmgybwnq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PINGING Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;PINGING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PINGING_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;PINGING_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text PINGING = Text.translatable("multiplayer.status.pinging");
+   static final Text PINGING_TEXT = Text.translatable("multiplayer.status.pinging");
    /**
     * @mapping {@literal hashed f_hyedfdnk Lnet/minecraft/unmapped/C_iwaoijqa;f_hyedfdnk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ONLINE Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;ONLINE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ONLINE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;ONLINE_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text ONLINE = Text.translatable("multiplayer.status.online");
+   static final Text ONLINE_TEXT = Text.translatable("multiplayer.status.online");
    /**
     * @mapping {@literal hashed f_fwjcwgsy Lnet/minecraft/unmapped/C_iwaoijqa;f_fwjcwgsy:Lnet/minecraft/unmapped/C_lwycrvls;}
     * @mapping {@literal named screen Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget;screen:Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;}
@@ -252,14 +252,14 @@
       private static final int ICON_WIDTH = 32;
       /**
        * @mapping {@literal hashed f_mkcrhnxz Lnet/minecraft/unmapped/C_iwaoijqa$C_qugogkwh;f_mkcrhnxz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-       * @mapping {@literal named TITLE Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;TITLE:Lnet/minecraft/text/Text;}
+       * @mapping {@literal named TITLE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;TITLE_TEXT:Lnet/minecraft/text/Text;}
        */
-      private static final Text TITLE = Text.translatable("lanServer.title");
+      private static final Text TITLE_TEXT = Text.translatable("lanServer.title");
       /**
        * @mapping {@literal hashed f_qloxqcap Lnet/minecraft/unmapped/C_iwaoijqa$C_qugogkwh;f_qloxqcap:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-       * @mapping {@literal named HIDDEN_ADDRESS Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;HIDDEN_ADDRESS:Lnet/minecraft/text/Text;}
+       * @mapping {@literal named HIDDEN_ADDRESS_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;HIDDEN_ADDRESS_TEXT:Lnet/minecraft/text/Text;}
        */
-      private static final Text HIDDEN_ADDRESS = Text.translatable("selectServer.hiddenAddress");
+      private static final Text HIDDEN_ADDRESS_TEXT = Text.translatable("selectServer.hiddenAddress");
       /**
        * @mapping {@literal hashed f_abptjvwp Lnet/minecraft/unmapped/C_iwaoijqa$C_qugogkwh;f_abptjvwp:Lnet/minecraft/unmapped/C_lwycrvls;}
        * @mapping {@literal named screen Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;screen:Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;}
@@ -298,10 +298,10 @@
       public void render(
          GuiGraphics graphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta
       ) {
-         graphics.drawText(this.client.textRenderer, TITLE, x + 32 + 3, y + 1, 16777215, false);
+         graphics.drawText(this.client.textRenderer, TITLE_TEXT, x + 32 + 3, y + 1, 16777215, false);
          graphics.drawText(this.client.textRenderer, this.server.getMotd(), x + 32 + 3, y + 12, 8421504, false);
          if (this.client.options.hideServerAddress) {
-            graphics.drawText(this.client.textRenderer, HIDDEN_ADDRESS, x + 32 + 3, y + 12 + 11, 3158064, false);
+            graphics.drawText(this.client.textRenderer, HIDDEN_ADDRESS_TEXT, x + 32 + 3, y + 12 + 11, 3158064, false);
          } else {
             graphics.drawText(this.client.textRenderer, this.server.getAddressPort(), x + 32 + 3, y + 12 + 11, 3158064, false);
          }
@@ -342,7 +342,7 @@
        * @mapping {@literal named getServerNarration Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget$LanServerEntry;getServerNarration()Lnet/minecraft/text/Text;}
        */
       public Text getServerNarration() {
-         return Text.empty().append(TITLE).append(CommonTexts.SPACE).append(this.server.getMotd());
+         return Text.empty().append(TITLE_TEXT).append(CommonTexts.SPACE).append(this.server.getMotd());
       }
    }
 
@@ -368,8 +368,8 @@
          int p = y + entryHeight / 2 - 9 / 2;
          graphics.drawText(
             this.client.textRenderer,
-            MultiplayerServerListWidget.LAN_SCANNING,
-            this.client.currentScreen.width / 2 - this.client.textRenderer.getWidth(MultiplayerServerListWidget.LAN_SCANNING) / 2,
+            MultiplayerServerListWidget.LAN_SCANNING_TEXT,
+            this.client.currentScreen.width / 2 - this.client.textRenderer.getWidth(MultiplayerServerListWidget.LAN_SCANNING_TEXT) / 2,
             p,
             16777215,
             false
@@ -385,7 +385,7 @@
        */
       @Override
       public Text getNarration() {
-         return MultiplayerServerListWidget.LAN_SCANNING;
+         return MultiplayerServerListWidget.LAN_SCANNING_TEXT;
       }
    }
 
@@ -495,10 +495,10 @@
                   this.screen.getServerListPinger().add(this.server, () -> this.client.execute(this::saveFile));
                } catch (UnknownHostException var2) {
                   this.server.ping = -1L;
-                  this.server.label = MultiplayerServerListWidget.CANNOT_RESOLVE;
+                  this.server.label = MultiplayerServerListWidget.CANNOT_RESOLVE_TEXT;
                } catch (Exception var3) {
                   this.server.ping = -1L;
-                  this.server.label = MultiplayerServerListWidget.CANNOT_CONNECT;
+                  this.server.label = MultiplayerServerListWidget.CANNOT_CONNECT_TEXT;
                }
             });
          }
@@ -520,7 +520,7 @@
          Text lv2;
          if (bl2) {
             s = 5;
-            lv2 = MultiplayerServerListWidget.INCOMPATIBLE;
+            lv2 = MultiplayerServerListWidget.INCOMPATIBLE_TEXT;
             list2 = this.server.playerListSummary;
          } else if (this.pinged()) {
             if (this.server.ping < 0L) {
@@ -538,7 +538,7 @@
             }
 
             if (this.server.ping < 0L) {
-               lv2 = MultiplayerServerListWidget.NO_CONNECTION;
+               lv2 = MultiplayerServerListWidget.NO_CONNECTION_TEXT;
                list2 = Collections.emptyList();
             } else {
                lv2 = Text.translatable("multiplayer.status.ping", this.server.ping);
@@ -551,7 +551,7 @@
                s = 8 - s;
             }
 
-            lv2 = MultiplayerServerListWidget.PINGING;
+            lv2 = MultiplayerServerListWidget.PINGING_TEXT;
             list2 = Collections.emptyList();
          }
 
@@ -751,17 +751,17 @@
          lv.append(Text.translatable("narrator.select", this.server.name));
          lv.append(CommonTexts.SENTENCE_SEPARATOR);
          if (!this.hasCompatibleProtocol()) {
-            lv.append(MultiplayerServerListWidget.INCOMPATIBLE);
+            lv.append(MultiplayerServerListWidget.INCOMPATIBLE_TEXT);
             lv.append(CommonTexts.SENTENCE_SEPARATOR);
             lv.append(Text.translatable("multiplayer.status.version.narration", this.server.version));
             lv.append(CommonTexts.SENTENCE_SEPARATOR);
             lv.append(Text.translatable("multiplayer.status.motd.narration", this.server.label));
          } else if (this.server.ping < 0L) {
-            lv.append(MultiplayerServerListWidget.NO_CONNECTION);
+            lv.append(MultiplayerServerListWidget.NO_CONNECTION_TEXT);
          } else if (!this.pinged()) {
-            lv.append(MultiplayerServerListWidget.PINGING);
+            lv.append(MultiplayerServerListWidget.PINGING_TEXT);
          } else {
-            lv.append(MultiplayerServerListWidget.ONLINE);
+            lv.append(MultiplayerServerListWidget.ONLINE_TEXT);
             lv.append(CommonTexts.SENTENCE_SEPARATOR);
             lv.append(Text.translatable("multiplayer.status.ping.narration", this.server.ping));
             lv.append(CommonTexts.SENTENCE_SEPARATOR);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.java	2023-08-06 01:21:37.170339956 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen.java	2023-08-06 01:19:56.652905156 +0000
@@ -32,9 +32,9 @@
    private static final Text CHECK_MESSAGE = Text.translatable("multiplayerWarning.check");
    /**
     * @mapping {@literal hashed f_bcaxjclm Lnet/minecraft/unmapped/C_lwwwumsz;f_bcaxjclm:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PROCEED Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen;PROCEED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PROCEED_TEXT Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen;PROCEED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PROCEED = HEADER.copy().append("\n").append(MESSAGE);
+   private static final Text PROCEED_TEXT = HEADER.copy().append("\n").append(MESSAGE);
    /**
     * @mapping {@literal hashed f_lkeprbfu Lnet/minecraft/unmapped/C_lwwwumsz;f_lkeprbfu:Lnet/minecraft/unmapped/C_wrmtlwqx;}
     * @mapping {@literal named parent Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen;parent:Lnet/minecraft/client/gui/screen/Screen;}
@@ -46,7 +46,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerWarningScreen;<init>(Lnet/minecraft/client/gui/screen/Screen;)V}
     */
    public MultiplayerWarningScreen(Screen parent) {
-      super(HEADER, MESSAGE, CHECK_MESSAGE, PROCEED);
+      super(HEADER, MESSAGE, CHECK_MESSAGE, PROCEED_TEXT);
       this.parent = parent;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java	2023-08-06 01:21:37.066338459 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java	2023-08-06 01:19:56.524903282 +0000
@@ -118,54 +118,54 @@
    private float timeCounter;
    /**
     * @mapping {@literal hashed f_olbgyiom Lnet/minecraft/unmapped/C_wolpvava;f_olbgyiom:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named HIDDEN Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDDEN:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named HIDDEN_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDDEN_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text HIDDEN = Text.translatable("gui.socialInteractions.status_hidden").formatted(Formatting.ITALIC);
+   private static final Text HIDDEN_TEXT = Text.translatable("gui.socialInteractions.status_hidden").formatted(Formatting.ITALIC);
    /**
     * @mapping {@literal hashed f_pezawfyv Lnet/minecraft/unmapped/C_wolpvava;f_pezawfyv:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named BLOCKED Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;BLOCKED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named BLOCKED_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;BLOCKED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text BLOCKED = Text.translatable("gui.socialInteractions.status_blocked").formatted(Formatting.ITALIC);
+   private static final Text BLOCKED_TEXT = Text.translatable("gui.socialInteractions.status_blocked").formatted(Formatting.ITALIC);
    /**
     * @mapping {@literal hashed f_oqfmxozt Lnet/minecraft/unmapped/C_wolpvava;f_oqfmxozt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named OFFLINE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;OFFLINE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named OFFLINE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;OFFLINE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text OFFLINE = Text.translatable("gui.socialInteractions.status_offline").formatted(Formatting.ITALIC);
+   private static final Text OFFLINE_TEXT = Text.translatable("gui.socialInteractions.status_offline").formatted(Formatting.ITALIC);
    /**
     * @mapping {@literal hashed f_raacocdb Lnet/minecraft/unmapped/C_wolpvava;f_raacocdb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named HIDDEN_OFFLINE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDDEN_OFFLINE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named HIDDEN_OFFLINE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDDEN_OFFLINE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text HIDDEN_OFFLINE = Text.translatable("gui.socialInteractions.status_hidden_offline").formatted(Formatting.ITALIC);
+   private static final Text HIDDEN_OFFLINE_TEXT = Text.translatable("gui.socialInteractions.status_hidden_offline").formatted(Formatting.ITALIC);
    /**
     * @mapping {@literal hashed f_mwbfkocl Lnet/minecraft/unmapped/C_wolpvava;f_mwbfkocl:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named BLOCKED_OFFLINE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;BLOCKED_OFFLINE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named BLOCKED_OFFLINE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;BLOCKED_OFFLINE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text BLOCKED_OFFLINE = Text.translatable("gui.socialInteractions.status_blocked_offline").formatted(Formatting.ITALIC);
+   private static final Text BLOCKED_OFFLINE_TEXT = Text.translatable("gui.socialInteractions.status_blocked_offline").formatted(Formatting.ITALIC);
    /**
     * @mapping {@literal hashed f_okxewylp Lnet/minecraft/unmapped/C_wolpvava;f_okxewylp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named REPORT_DISABLED Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;REPORT_DISABLED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named REPORT_DISABLED_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;REPORT_DISABLED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text REPORT_DISABLED = Text.translatable("gui.socialInteractions.tooltip.report.disabled");
+   private static final Text REPORT_DISABLED_TEXT = Text.translatable("gui.socialInteractions.tooltip.report.disabled");
    /**
     * @mapping {@literal hashed f_tdndxpes Lnet/minecraft/unmapped/C_wolpvava;f_tdndxpes:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named NOT_REPORTABLE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;NOT_REPORTABLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named NOT_REPORTABLE_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;NOT_REPORTABLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text NOT_REPORTABLE = Text.translatable("gui.socialInteractions.tooltip.report.not_reportable");
+   private static final Text NOT_REPORTABLE_TEXT = Text.translatable("gui.socialInteractions.tooltip.report.not_reportable");
    /**
     * @mapping {@literal hashed f_ivvohkov Lnet/minecraft/unmapped/C_wolpvava;f_ivvohkov:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named HIDE_MESSAGES Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDE_MESSAGES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named HIDE_MESSAGES_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;HIDE_MESSAGES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text HIDE_MESSAGES = Text.translatable("gui.socialInteractions.tooltip.hide");
+   private static final Text HIDE_MESSAGES_TEXT = Text.translatable("gui.socialInteractions.tooltip.hide");
    /**
     * @mapping {@literal hashed f_qctdcqsw Lnet/minecraft/unmapped/C_wolpvava;f_qctdcqsw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SHOW_MESSAGES Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;SHOW_MESSAGES:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SHOW_MESSAGES_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;SHOW_MESSAGES_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SHOW_MESSAGES = Text.translatable("gui.socialInteractions.tooltip.show");
+   private static final Text SHOW_MESSAGES_TEXT = Text.translatable("gui.socialInteractions.tooltip.show");
    /**
     * @mapping {@literal hashed f_ovmwamcr Lnet/minecraft/unmapped/C_wolpvava;f_ovmwamcr:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named REPORT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;REPORT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named REPORT_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;REPORT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text REPORT = Text.translatable("gui.socialInteractions.tooltip.report");
+   private static final Text REPORT_TEXT = Text.translatable("gui.socialInteractions.tooltip.report");
    /**
     * @mapping {@literal hashed f_xdrrnblw Lnet/minecraft/unmapped/C_wolpvava;f_xdrrnblw:I}
     * @mapping {@literal named SKIN_SIZE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;SKIN_SIZE:I}
@@ -274,7 +274,7 @@
                return SocialInteractionsPlayerListEntry.this.getNarrationMessage(super.getNarrationMessage());
             }
          };
-         this.hideButton.setTooltip(Tooltip.create(HIDE_MESSAGES, lv2));
+         this.hideButton.setTooltip(Tooltip.create(HIDE_MESSAGES_TEXT, lv2));
          this.hideButton.setTooltipDelay(10);
          this.showButton = new TexturedButtonWidget(0, 0, 20, 20, 20, 38, 20, SocialInteractionsScreen.SOCIAL_INTERACTIONS_TEXTURE, 256, 256, arg2 -> {
             lv4.showPlayer(uuid);
@@ -288,7 +288,7 @@
                return SocialInteractionsPlayerListEntry.this.getNarrationMessage(super.getNarrationMessage());
             }
          };
-         this.showButton.setTooltip(Tooltip.create(SHOW_MESSAGES, lv3));
+         this.showButton.setTooltip(Tooltip.create(SHOW_MESSAGES_TEXT, lv3));
          this.showButton.setTooltipDelay(10);
          this.reportButton.active = false;
          this.buttons = new ArrayList();
@@ -306,13 +306,13 @@
     */
    private Tooltip getTooltip() {
       if (!this.reportable) {
-         return Tooltip.create(NOT_REPORTABLE);
+         return Tooltip.create(NOT_REPORTABLE_TEXT);
       } else if (!this.reportingEnabled) {
-         return Tooltip.create(REPORT_DISABLED);
+         return Tooltip.create(REPORT_DISABLED_TEXT);
       } else {
          return !this.hasSentMessages
             ? Tooltip.create(Text.translatable("gui.socialInteractions.tooltip.report.no_messages", this.name))
-            : Tooltip.create(REPORT, Text.translatable("gui.socialInteractions.narration.report", this.name));
+            : Tooltip.create(REPORT_TEXT, Text.translatable("gui.socialInteractions.narration.report", this.name));
       }
    }
 
@@ -469,15 +469,15 @@
       boolean bl = this.client.getSocialInteractionsManager().isPlayerHidden(this.uuid);
       boolean bl2 = this.client.getSocialInteractionsManager().isPlayerBlocked(this.uuid);
       if (bl2 && this.offline) {
-         return BLOCKED_OFFLINE;
+         return BLOCKED_OFFLINE_TEXT;
       } else if (bl && this.offline) {
-         return HIDDEN_OFFLINE;
+         return HIDDEN_OFFLINE_TEXT;
       } else if (bl2) {
-         return BLOCKED;
+         return BLOCKED_TEXT;
       } else if (bl) {
-         return HIDDEN;
+         return HIDDEN_TEXT;
       } else {
-         return this.offline ? OFFLINE : CommonTexts.EMPTY;
+         return this.offline ? OFFLINE_TEXT : CommonTexts.EMPTY;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-06 01:21:37.182340129 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-06 01:19:56.664905332 +0000
@@ -68,29 +68,29 @@
    private static final Text SELECTED_BLOCKED_TAB_TITLE = BLOCKED_TAB_TITLE.copyContentOnly().formatted(Formatting.UNDERLINE);
    /**
     * @mapping {@literal hashed f_rvheyeaw Lnet/minecraft/unmapped/C_brwvrttn;f_rvheyeaw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SEARCH Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;SEARCH:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SEARCH_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;SEARCH_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SEARCH = Text.translatable("gui.socialInteractions.search_hint").formatted(Formatting.ITALIC).formatted(Formatting.GRAY);
+   private static final Text SEARCH_TEXT = Text.translatable("gui.socialInteractions.search_hint").formatted(Formatting.ITALIC).formatted(Formatting.GRAY);
    /**
     * @mapping {@literal hashed f_eyehtvpp Lnet/minecraft/unmapped/C_brwvrttn;f_eyehtvpp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named EMPTY_SEARCH Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_SEARCH:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named EMPTY_SEARCH_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_SEARCH_TEXT:Lnet/minecraft/text/Text;}
     */
-   static final Text EMPTY_SEARCH = Text.translatable("gui.socialInteractions.search_empty").formatted(Formatting.GRAY);
+   static final Text EMPTY_SEARCH_TEXT = Text.translatable("gui.socialInteractions.search_empty").formatted(Formatting.GRAY);
    /**
     * @mapping {@literal hashed f_yevfmwjl Lnet/minecraft/unmapped/C_brwvrttn;f_yevfmwjl:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named EMPTY_HIDDEN Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_HIDDEN:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named EMPTY_HIDDEN_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_HIDDEN_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text EMPTY_HIDDEN = Text.translatable("gui.socialInteractions.empty_hidden").formatted(Formatting.GRAY);
+   private static final Text EMPTY_HIDDEN_TEXT = Text.translatable("gui.socialInteractions.empty_hidden").formatted(Formatting.GRAY);
    /**
     * @mapping {@literal hashed f_fyotpemy Lnet/minecraft/unmapped/C_brwvrttn;f_fyotpemy:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named EMPTY_BLOCKED Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_BLOCKED:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named EMPTY_BLOCKED_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;EMPTY_BLOCKED_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text EMPTY_BLOCKED = Text.translatable("gui.socialInteractions.empty_blocked").formatted(Formatting.GRAY);
+   private static final Text EMPTY_BLOCKED_TEXT = Text.translatable("gui.socialInteractions.empty_blocked").formatted(Formatting.GRAY);
    /**
     * @mapping {@literal hashed f_cxfmwlfl Lnet/minecraft/unmapped/C_brwvrttn;f_cxfmwlfl:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named BLOCKING Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;BLOCKING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named BLOCKING_TEXT Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;BLOCKING_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text BLOCKING = Text.translatable("gui.socialInteractions.blocking_hint");
+   private static final Text BLOCKING_TEXT = Text.translatable("gui.socialInteractions.blocking_hint");
    /**
     * @mapping {@literal hashed f_yxghdclo Lnet/minecraft/unmapped/C_brwvrttn;f_yxghdclo:I}
     * @mapping {@literal named BACKGROUND_BORDER_SIZE Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;BACKGROUND_BORDER_SIZE:I}
@@ -256,7 +256,7 @@
       int i = this.playerList.getRowWidth() / 3;
       int j = this.playerList.getRowLeft();
       int k = this.playerList.getRowRight();
-      int l = this.textRenderer.getWidth(BLOCKING) + 40;
+      int l = this.textRenderer.getWidth(BLOCKING_TEXT) + 40;
       int m = 64 + this.getWindowHeight();
       int n = (this.width - l) / 2 + 3;
       this.allTabButton = this.addDrawableChild(
@@ -273,14 +273,14 @@
             .build()
       );
       String string = this.searchBox != null ? this.searchBox.getText() : "";
-      this.searchBox = new TextFieldWidget(this.textRenderer, this.getXMargin() + 29, 75, 198, 13, SEARCH) {
+      this.searchBox = new TextFieldWidget(this.textRenderer, this.getXMargin() + 29, 75, 198, 13, SEARCH_TEXT) {
          /**
           * Mapping not found
           */
          @Override
          protected MutableText getNarrationMessage() {
             return !SocialInteractionsScreen.this.searchBox.getText().isEmpty() && SocialInteractionsScreen.this.playerList.isEmpty()
-               ? super.getNarrationMessage().append(", ").append(SocialInteractionsScreen.EMPTY_SEARCH)
+               ? super.getNarrationMessage().append(", ").append(SocialInteractionsScreen.EMPTY_SEARCH_TEXT)
                : super.getNarrationMessage();
          }
       };
@@ -288,11 +288,11 @@
       this.searchBox.setVisible(true);
       this.searchBox.setEditableColor(16777215);
       this.searchBox.setText(string);
-      this.searchBox.setHint(SEARCH);
+      this.searchBox.setHint(SEARCH_TEXT);
       this.searchBox.setChangedListener(this::onSearchChange);
       this.addSelectableChild(this.searchBox);
       this.addSelectableChild(this.playerList);
-      this.blockingButton = this.addDrawableChild(ButtonWidget.builder(BLOCKING, button -> this.client.setScreen(new ConfirmLinkScreen(acceptButton -> {
+      this.blockingButton = this.addDrawableChild(ButtonWidget.builder(BLOCKING_TEXT, button -> this.client.setScreen(new ConfirmLinkScreen(acceptButton -> {
             if (acceptButton) {
                Util.getOperatingSystem().open("https://aka.ms/javablocking");
             }
@@ -335,12 +335,12 @@
 
       ChatNarratorManager lv2 = this.client.getChatNarratorManager();
       if (!this.searchBox.getText().isEmpty() && this.playerList.isEmpty() && !this.searchBox.isFocused()) {
-         lv2.narrate(EMPTY_SEARCH);
+         lv2.narrate(EMPTY_SEARCH_TEXT);
       } else if (bl) {
          if (currentTab == SocialInteractionsScreen.Tab.HIDDEN) {
-            lv2.narrate(EMPTY_HIDDEN);
+            lv2.narrate(EMPTY_HIDDEN_TEXT);
          } else if (currentTab == SocialInteractionsScreen.Tab.BLOCKED) {
-            lv2.narrate(EMPTY_BLOCKED);
+            lv2.narrate(EMPTY_BLOCKED_TEXT);
          }
       }
    }
@@ -370,11 +370,11 @@
       if (!this.playerList.isEmpty()) {
          this.playerList.render(graphics, mouseX, mouseY, delta);
       } else if (!this.searchBox.getText().isEmpty()) {
-         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_SEARCH, this.width / 2, (72 + this.getListEnd()) / 2, -1);
+         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_SEARCH_TEXT, this.width / 2, (72 + this.getListEnd()) / 2, -1);
       } else if (this.currentTab == SocialInteractionsScreen.Tab.HIDDEN) {
-         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_HIDDEN, this.width / 2, (72 + this.getListEnd()) / 2, -1);
+         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_HIDDEN_TEXT, this.width / 2, (72 + this.getListEnd()) / 2, -1);
       } else if (this.currentTab == SocialInteractionsScreen.Tab.BLOCKED) {
-         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_BLOCKED, this.width / 2, (72 + this.getListEnd()) / 2, -1);
+         graphics.drawCenteredShadowedText(this.client.textRenderer, EMPTY_BLOCKED_TEXT, this.width / 2, (72 + this.getListEnd()) / 2, -1);
       }
 
       this.searchBox.render(graphics, mouseX, mouseY, delta);
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java namedSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java	2023-08-06 01:21:37.206340474 +0000
+++ namedSrc/net/minecraft/client/gui/screen/OpenToLanScreen.java	2023-08-06 01:19:56.704905917 +0000
@@ -34,34 +34,34 @@
    private static final int MAX_PORT = 65535;
    /**
     * @mapping {@literal hashed f_ivfhvchz Lnet/minecraft/unmapped/C_ijdgucdc;f_ivfhvchz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ALLOW_COMMANDS Lnet/minecraft/client/gui/screen/OpenToLanScreen;ALLOW_COMMANDS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ALLOW_COMMANDS_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;ALLOW_COMMANDS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ALLOW_COMMANDS = Text.translatable("selectWorld.allowCommands");
+   private static final Text ALLOW_COMMANDS_TEXT = Text.translatable("selectWorld.allowCommands");
    /**
     * @mapping {@literal hashed f_tlyxzqdc Lnet/minecraft/unmapped/C_ijdgucdc;f_tlyxzqdc:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named GAME_MODE Lnet/minecraft/client/gui/screen/OpenToLanScreen;GAME_MODE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named GAME_MODE_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;GAME_MODE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text GAME_MODE = Text.translatable("selectWorld.gameMode");
+   private static final Text GAME_MODE_TEXT = Text.translatable("selectWorld.gameMode");
    /**
     * @mapping {@literal hashed f_hzsxmbwz Lnet/minecraft/unmapped/C_ijdgucdc;f_hzsxmbwz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named OTHER_PLAYERS Lnet/minecraft/client/gui/screen/OpenToLanScreen;OTHER_PLAYERS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named OTHER_PLAYERS_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;OTHER_PLAYERS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text OTHER_PLAYERS = Text.translatable("lanServer.otherPlayers");
+   private static final Text OTHER_PLAYERS_TEXT = Text.translatable("lanServer.otherPlayers");
    /**
     * @mapping {@literal hashed f_xbejrkhk Lnet/minecraft/unmapped/C_ijdgucdc;f_xbejrkhk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PORT Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PORT_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PORT = Text.translatable("lanServer.port");
+   private static final Text PORT_TEXT = Text.translatable("lanServer.port");
    /**
     * @mapping {@literal hashed f_vamaqjcq Lnet/minecraft/unmapped/C_ijdgucdc;f_vamaqjcq:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PORT_UNAVAILABLE Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT_UNAVAILABLE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PORT_UNAVAILABLE_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT_UNAVAILABLE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PORT_UNAVAILABLE = Text.translatable("lanServer.port.unavailable.new", 1024, 65535);
+   private static final Text PORT_UNAVAILABLE_TEXT = Text.translatable("lanServer.port.unavailable.new", 1024, 65535);
    /**
     * @mapping {@literal hashed f_dfumqqyh Lnet/minecraft/unmapped/C_ijdgucdc;f_dfumqqyh:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named PORT_INVALID Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT_INVALID:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named PORT_INVALID_TEXT Lnet/minecraft/client/gui/screen/OpenToLanScreen;PORT_INVALID_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text PORT_INVALID = Text.translatable("lanServer.port.invalid.new", 1024, 65535);
+   private static final Text PORT_INVALID_TEXT = Text.translatable("lanServer.port.invalid.new", 1024, 65535);
    /**
     * @mapping {@literal hashed f_czsqqupa Lnet/minecraft/unmapped/C_ijdgucdc;f_czsqqupa:I}
     * @mapping {@literal named INVALID_PORT_COLOR Lnet/minecraft/client/gui/screen/OpenToLanScreen;INVALID_PORT_COLOR:I}
@@ -115,11 +115,11 @@
          CyclingButtonWidget.<GameMode>builder(GameMode::getSimpleTranslatableName)
             .values(GameMode.SURVIVAL, GameMode.SPECTATOR, GameMode.CREATIVE, GameMode.ADVENTURE)
             .initially(this.gameMode)
-            .build(this.width / 2 - 155, 100, 150, 20, GAME_MODE, (button, gameMode) -> this.gameMode = gameMode)
+            .build(this.width / 2 - 155, 100, 150, 20, GAME_MODE_TEXT, (button, gameMode) -> this.gameMode = gameMode)
       );
       this.addDrawableChild(
          CyclingButtonWidget.onOffBuilder(this.allowCommands)
-            .build(this.width / 2 + 5, 100, 150, 20, ALLOW_COMMANDS, (button, allowCommands) -> this.allowCommands = allowCommands)
+            .build(this.width / 2 + 5, 100, 150, 20, ALLOW_COMMANDS_TEXT, (button, allowCommands) -> this.allowCommands = allowCommands)
       );
       ButtonWidget lv2 = ButtonWidget.builder(Text.translatable("lanServer.start"), button -> {
          this.client.setScreen(null);
@@ -181,13 +181,13 @@
          try {
             this.localPort = Integer.parseInt(port);
             if (this.localPort < 1024 || this.localPort > 65535) {
-               return PORT_INVALID;
+               return PORT_INVALID_TEXT;
             } else {
-               return !NetworkUtils.isPortAvailable(this.localPort) ? PORT_UNAVAILABLE : null;
+               return !NetworkUtils.m_wsltejex(this.localPort) ? PORT_UNAVAILABLE_TEXT : null;
             }
          } catch (NumberFormatException var3) {
             this.localPort = NetworkUtils.findLocalPort();
-            return PORT_INVALID;
+            return PORT_INVALID_TEXT;
          }
       }
    }
@@ -199,8 +199,8 @@
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.renderBackground(graphics);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 50, 16777215);
-      graphics.drawCenteredShadowedText(this.textRenderer, OTHER_PLAYERS, this.width / 2, 82, 16777215);
-      graphics.drawCenteredShadowedText(this.textRenderer, PORT, this.width / 2, 142, 16777215);
+      graphics.drawCenteredShadowedText(this.textRenderer, OTHER_PLAYERS_TEXT, this.width / 2, 82, 16777215);
+      graphics.drawCenteredShadowedText(this.textRenderer, PORT_TEXT, this.width / 2, 142, 16777215);
       super.render(graphics, mouseX, mouseY, delta);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java	2023-08-06 01:21:37.090338805 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/LanguageOptionsScreen.java	2023-08-06 01:19:56.556903751 +0000
@@ -24,9 +24,12 @@
 public class LanguageOptionsScreen extends GameOptionsScreen {
    /**
     * @mapping {@literal hashed f_gcvzidgk Lnet/minecraft/unmapped/C_cplybxjv;f_gcvzidgk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named LANGUAGE_WARNING Lnet/minecraft/client/gui/screen/option/LanguageOptionsScreen;LANGUAGE_WARNING:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named LANGUAGE_WARNING_TEXT Lnet/minecraft/client/gui/screen/option/LanguageOptionsScreen;LANGUAGE_WARNING_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text LANGUAGE_WARNING = Text.literal("(").append(Text.translatable("options.languageWarning")).append(")").formatted(Formatting.GRAY);
+   private static final Text LANGUAGE_WARNING_TEXT = Text.literal("(")
+      .append(Text.translatable("options.languageWarning"))
+      .append(")")
+      .formatted(Formatting.GRAY);
    /**
     * @mapping {@literal hashed f_rcsjxelp Lnet/minecraft/unmapped/C_cplybxjv;f_rcsjxelp:Lnet/minecraft/unmapped/C_cplybxjv$C_fsfqepzt;}
     * @mapping {@literal named languageSelectionList Lnet/minecraft/client/gui/screen/option/LanguageOptionsScreen;languageSelectionList:Lnet/minecraft/client/gui/screen/option/LanguageOptionsScreen$LanguageSelectionListWidget;}
@@ -101,7 +104,7 @@
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       this.languageSelectionList.render(graphics, mouseX, mouseY, delta);
       graphics.drawCenteredShadowedText(this.textRenderer, this.title, this.width / 2, 16, 16777215);
-      graphics.drawCenteredShadowedText(this.textRenderer, LANGUAGE_WARNING, this.width / 2, this.height - 56, 8421504);
+      graphics.drawCenteredShadowedText(this.textRenderer, LANGUAGE_WARNING_TEXT, this.width / 2, this.height - 56, 8421504);
       super.render(graphics, mouseX, mouseY, delta);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java namedSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java	2023-08-06 01:21:37.074338575 +0000
+++ namedSrc/net/minecraft/client/gui/screen/option/OptionsScreen.java	2023-08-06 01:19:56.536903458 +0000
@@ -34,54 +34,54 @@
 public class OptionsScreen extends Screen {
    /**
     * @mapping {@literal hashed f_jtqnxtpy Lnet/minecraft/unmapped/C_agyxinfj;f_jtqnxtpy:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SKIN_CUSTOMIZATION Lnet/minecraft/client/gui/screen/option/OptionsScreen;SKIN_CUSTOMIZATION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SKIN_CUSTOMIZATION_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;SKIN_CUSTOMIZATION_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SKIN_CUSTOMIZATION = Text.translatable("options.skinCustomisation");
+   private static final Text SKIN_CUSTOMIZATION_TEXT = Text.translatable("options.skinCustomisation");
    /**
     * @mapping {@literal hashed f_pacibifm Lnet/minecraft/unmapped/C_agyxinfj;f_pacibifm:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SOUNDS Lnet/minecraft/client/gui/screen/option/OptionsScreen;SOUNDS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named SOUNDS_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;SOUNDS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text SOUNDS = Text.translatable("options.sounds");
+   private static final Text SOUNDS_TEXT = Text.translatable("options.sounds");
    /**
     * @mapping {@literal hashed f_tvehebjf Lnet/minecraft/unmapped/C_agyxinfj;f_tvehebjf:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named VIDEO Lnet/minecraft/client/gui/screen/option/OptionsScreen;VIDEO:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named VIDEO_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;VIDEO_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text VIDEO = Text.translatable("options.video");
+   private static final Text VIDEO_TEXT = Text.translatable("options.video");
    /**
     * @mapping {@literal hashed f_bjgagrlf Lnet/minecraft/unmapped/C_agyxinfj;f_bjgagrlf:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CONTROLS Lnet/minecraft/client/gui/screen/option/OptionsScreen;CONTROLS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CONTROLS_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;CONTROLS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text CONTROLS = Text.translatable("options.controls");
+   private static final Text CONTROLS_TEXT = Text.translatable("options.controls");
    /**
     * @mapping {@literal hashed f_ruxoqwyn Lnet/minecraft/unmapped/C_agyxinfj;f_ruxoqwyn:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named LANGUAGE Lnet/minecraft/client/gui/screen/option/OptionsScreen;LANGUAGE:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named LANGUAGE_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;LANGUAGE_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text LANGUAGE = Text.translatable("options.language");
+   private static final Text LANGUAGE_TEXT = Text.translatable("options.language");
    /**
     * @mapping {@literal hashed f_nzmrlhuy Lnet/minecraft/unmapped/C_agyxinfj;f_nzmrlhuy:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CHAT Lnet/minecraft/client/gui/screen/option/OptionsScreen;CHAT:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CHAT_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;CHAT_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text CHAT = Text.translatable("options.chat.title");
+   private static final Text CHAT_TEXT = Text.translatable("options.chat.title");
    /**
     * @mapping {@literal hashed f_ewcnxrrc Lnet/minecraft/unmapped/C_agyxinfj;f_ewcnxrrc:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named RESOURCE_PACKS Lnet/minecraft/client/gui/screen/option/OptionsScreen;RESOURCE_PACKS:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named RESOURCE_PACKS_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;RESOURCE_PACKS_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text RESOURCE_PACKS = Text.translatable("options.resourcepack");
+   private static final Text RESOURCE_PACKS_TEXT = Text.translatable("options.resourcepack");
    /**
     * @mapping {@literal hashed f_cmbsnsgt Lnet/minecraft/unmapped/C_agyxinfj;f_cmbsnsgt:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named ACCESSIBILITY Lnet/minecraft/client/gui/screen/option/OptionsScreen;ACCESSIBILITY:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named ACCESSIBILITY_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;ACCESSIBILITY_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text ACCESSIBILITY = Text.translatable("options.accessibility.title");
+   private static final Text ACCESSIBILITY_TEXT = Text.translatable("options.accessibility.title");
    /**
     * @mapping {@literal hashed f_bfgxwwch Lnet/minecraft/unmapped/C_agyxinfj;f_bfgxwwch:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named TELEMETRY Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named TELEMETRY_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;TELEMETRY_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text TELEMETRY = Text.translatable("options.telemetry");
+   private static final Text TELEMETRY_TEXT = Text.translatable("options.telemetry");
    /**
     * @mapping {@literal hashed f_jwmdeajx Lnet/minecraft/unmapped/C_agyxinfj;f_jwmdeajx:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named CREDITS_AND_ATTRIBUTION Lnet/minecraft/client/gui/screen/option/OptionsScreen;CREDITS_AND_ATTRIBUTION:Lnet/minecraft/text/Text;}
+    * @mapping {@literal named CREDITS_AND_ATTRIBUTION_TEXT Lnet/minecraft/client/gui/screen/option/OptionsScreen;CREDITS_AND_ATTRIBUTION_TEXT:Lnet/minecraft/text/Text;}
     */
-   private static final Text CREDITS_AND_ATTRIBUTION = Text.translatable("options.credits_and_attribution");
+   private static final Text CREDITS_AND_ATTRIBUTION_TEXT = Text.translatable("options.credits_and_attribution");
    /**
     * @mapping {@literal hashed f_dbpiprpt Lnet/minecraft/unmapped/C_agyxinfj;f_dbpiprpt:I}
     * @mapping {@literal named COLUMNS Lnet/minecraft/client/gui/screen/option/OptionsScreen;COLUMNS:I}
@@ -129,23 +129,23 @@
       lv2.add(this.settings.getFov().createButton(this.client.options, 0, 0, 150));
       lv2.add(this.createOnlineButton());
       lv2.add(SpacerWidget.withHeight(26), 2);
-      lv2.add(this.createButton(SKIN_CUSTOMIZATION, () -> new SkinOptionsScreen(this, this.settings)));
-      lv2.add(this.createButton(SOUNDS, () -> new SoundOptionsScreen(this, this.settings)));
-      lv2.add(this.createButton(VIDEO, () -> new VideoOptionsScreen(this, this.settings)));
-      lv2.add(this.createButton(CONTROLS, () -> new ControlsOptionsScreen(this, this.settings)));
-      lv2.add(this.createButton(LANGUAGE, () -> new LanguageOptionsScreen(this, this.settings, this.client.getLanguageManager())));
-      lv2.add(this.createButton(CHAT, () -> new ChatOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(SKIN_CUSTOMIZATION_TEXT, () -> new SkinOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(SOUNDS_TEXT, () -> new SoundOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(VIDEO_TEXT, () -> new VideoOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(CONTROLS_TEXT, () -> new ControlsOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(LANGUAGE_TEXT, () -> new LanguageOptionsScreen(this, this.settings, this.client.getLanguageManager())));
+      lv2.add(this.createButton(CHAT_TEXT, () -> new ChatOptionsScreen(this, this.settings)));
       lv2.add(
          this.createButton(
-            RESOURCE_PACKS,
+            RESOURCE_PACKS_TEXT,
             () -> new PackScreen(
                   this.client.getResourcePackManager(), this::updateResourcePacks, this.client.getResourcePackDir(), Text.translatable("resourcePack.title")
                )
          )
       );
-      lv2.add(this.createButton(ACCESSIBILITY, () -> new AccessibilityOptionsScreen(this, this.settings)));
-      lv2.add(this.createButton(TELEMETRY, () -> new TelemetryDataScreen(this, this.settings)));
-      lv2.add(this.createButton(CREDITS_AND_ATTRIBUTION, () -> new CreditsAndAttributionScreen(this)));
+      lv2.add(this.createButton(ACCESSIBILITY_TEXT, () -> new AccessibilityOptionsScreen(this, this.settings)));
+      lv2.add(this.createButton(TELEMETRY_TEXT, () -> new TelemetryDataScreen(this, this.settings)));
+      lv2.add(this.createButton(CREDITS_AND_ATTRIBUTION_TEXT, () -> new CreditsAndAttributionScreen(this)));
       lv2.add(
          ButtonWidget.builder(CommonTexts.DONE, arg -> this.client.setScreen(this.parent)).width(200).build(), 2, lv2.copyDefaultSettings().setTopPadding(6)
       );


The remaining diff is too long!

Please sign in to comment.