Skip to content

Commit

Permalink
A few n/m/block and n/m/inventory mappings (#542)
Browse files Browse the repository at this point in the history
* A few n/m/block and n/m/inventory mappings

* Fix conflicts with #540

* Add an extra relevant mapping

* `world2` -> `unusedWorld`
  • Loading branch information
IotaBread authored Feb 6, 2024
1 parent b621525 commit d9303b7
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 11 deletions.
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/BlockRegistryKeys.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_pyxrohya net/minecraft/block/BlockRegistryKeys
METHOD m_lpexxklc of (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;
7 changes: 7 additions & 0 deletions mappings/net/minecraft/block/TrialSpawnerBlock.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS net/minecraft/unmapped/C_qiypfnai net/minecraft/block/TrialSpawnerBlock
FIELD f_eqxijsod STATE Lnet/minecraft/unmapped/C_cgckxfsw;
METHOD m_hqexpyll (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_ndgqjckh;)V
ARG 1 unusedWorld
ARG 4 trialSpawner
METHOD m_pvtrnirj (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_ndgqjckh;)V
ARG 3 trialSpawner
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
CLASS net/minecraft/unmapped/C_snnddtnv net/minecraft/block/entity/DecoratedPotBlockEntity
FIELD f_bsjlvxwm lastWobbleTime J
FIELD f_dwwkwusv identifier Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_dwwkwusv lootTableId Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_hmmflmll ITEM_KEY Ljava/lang/String;
FIELD f_lkaissqj SHERDS_KEY Ljava/lang/String;
FIELD f_ntlmymra sherds Lnet/minecraft/unmapped/C_snnddtnv$C_gxhwrzck;
FIELD f_skwmykui lootTableSeed J
FIELD f_uumxnicq lastWobbleType Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;
FIELD f_yprzpvoh POT_WOBBLES_EVENT I
METHOD m_faozmaju wobble (Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;)V
ARG 1 wobbleType
METHOD m_lfhantja asStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
METHOD m_mlqltvsn getOrientation ()Lnet/minecraft/unmapped/C_xpuuihxf;
METHOD m_qjeeptjd (Lnet/minecraft/unmapped/C_snnddtnv$C_gxhwrzck;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 sherds
Expand All @@ -25,3 +30,5 @@ CLASS net/minecraft/unmapped/C_snnddtnv net/minecraft/block/entity/DecoratedPotB
COMMENT Defaults to {@link net.minecraft.item.Items#BRICK} if the index is out-of-bounds.
ARG 0 list
ARG 1 index
CLASS C_qjewosgd WobbleType
FIELD f_dwazkvpc duration I
19 changes: 15 additions & 4 deletions mappings/net/minecraft/block/entity/SkullBlockEntity.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_vrhaavsg net/minecraft/block/entity/SkullBlockEntity
FIELD f_cylawnts NONNULL_EXECUTOR Ljava/util/concurrent/Executor;
FIELD f_fstdnzen powered Z
FIELD f_fwgdpesg owner Lcom/mojang/authlib/GameProfile;
FIELD f_hsmyslsr animationTicks I
Expand All @@ -10,13 +11,17 @@ CLASS net/minecraft/unmapped/C_vrhaavsg net/minecraft/block/entity/SkullBlockEnt
METHOD <init> (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
ARG 1 pos
ARG 2 state
METHOD m_btgpxhvt (Lnet/minecraft/unmapped/C_hhlwcnih;)V
METHOD m_atwdezof (Ljava/lang/Runnable;)V
ARG 0 task
METHOD m_btgpxhvt resolveSkullOwner (Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 0 nbt
METHOD m_ebobyxzo (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)V
METHOD m_ebobyxzo resolveSkullOwner (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)V
ARG 0 nbt
METHOD m_eoxjszqd (Ljava/lang/String;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;
ARG 1 skullOwner
METHOD m_eoxjszqd fetchProfile (Ljava/lang/String;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;
ARG 0 username
ARG 1 services
ARG 2 isCacheNull
METHOD m_fanntxcn getOwner ()Lcom/mojang/authlib/GameProfile;
METHOD m_flpykord setServices (Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/concurrent/Executor;)V
ARG 0 services
Expand All @@ -29,10 +34,16 @@ CLASS net/minecraft/unmapped/C_vrhaavsg net/minecraft/block/entity/SkullBlockEnt
ARG 1 tickDelta
METHOD m_qoowcevv (Ljava/util/function/BooleanSupplier;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/Optional;)Ljava/util/Optional;
ARG 2 gameProfile
METHOD m_rrmjdeiy (Lnet/minecraft/unmapped/C_hhlwcnih;)Lcom/mojang/authlib/GameProfile;
METHOD m_rrmjdeiy getProfile (Lnet/minecraft/unmapped/C_hhlwcnih;)Lcom/mojang/authlib/GameProfile;
ARG 0 nbt
METHOD m_stbhfbap clientTick (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vrhaavsg;)V
ARG 3 skull
METHOD m_vsbyiyln fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
ARG 0 name
METHOD m_wfqfywws (Ljava/util/Optional;)V
ARG 1 profile
METHOD m_yahawkds (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;Ljava/util/Optional;)V
ARG 2 profile
METHOD m_yjhsliqo hasTextures (Lcom/mojang/authlib/GameProfile;)Z
ARG 0 gameProfile
METHOD m_yrfbflxq loadOwnerProperties ()V
4 changes: 4 additions & 0 deletions mappings/net/minecraft/entity/player/PlayerEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
METHOD m_arduainz isCreativeLevelTwoOp ()Z
METHOD m_aubfsqlm setReducedDebugInfo (Z)V
ARG 1 reducedDebugInfo
METHOD m_aupwtybw (I)Z
ARG 0 c
METHOD m_awfvykox attack (Lnet/minecraft/unmapped/C_astfners;)V
ARG 1 target
METHOD m_bjasxujf getBlockBreakingSpeed (Lnet/minecraft/unmapped/C_txtbiemp;)F
Expand Down Expand Up @@ -131,6 +133,8 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity
METHOD m_iujuxkpr disableShield ()V
METHOD m_jnzfvwue isMainPlayer ()Z
METHOD m_knabeuog vanishCursedItems ()V
METHOD m_kuclbyvl isValidUsername (Ljava/lang/String;)Z
ARG 0 username
METHOD m_kxxqgmsc sendTradeOffers (ILnet/minecraft/unmapped/C_eygsjfgm;IIZZ)V
ARG 1 syncId
ARG 2 offers
Expand Down
7 changes: 4 additions & 3 deletions mappings/net/minecraft/inventory/Inventory.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ CLASS net/minecraft/unmapped/C_pjtstjoq net/minecraft/inventory/Inventory
ARG 1 slot
ARG 2 stack
METHOD m_crvopqlx canPlayerUse (Lnet/minecraft/unmapped/C_kvegafmh;Lnet/minecraft/unmapped/C_jzrpycqo;F)Z
ARG 0 entity
ARG 2 additionalRange
ARG 0 blockEntity
ARG 1 player
ARG 2 range
METHOD m_dmbfvefd size ()I
METHOD m_dqmcaiag containsAny (Ljava/util/Set;)Z
COMMENT Determines whether this inventory contains any of the given candidate items.
Expand Down Expand Up @@ -55,4 +56,4 @@ CLASS net/minecraft/unmapped/C_pjtstjoq net/minecraft/inventory/Inventory
ARG 1 predicate
METHOD m_zfgmlilu canPlayerUse (Lnet/minecraft/unmapped/C_kvegafmh;Lnet/minecraft/unmapped/C_jzrpycqo;)Z
ARG 0 blockEntity
ARG 1 entity
ARG 1 player
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CLASS net/minecraft/unmapped/C_rsrfiyeu net/minecraft/inventory/JukeboxInventory
CLASS net/minecraft/unmapped/C_rsrfiyeu net/minecraft/inventory/SingleStackInventory
METHOD m_bkmnewbu setStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V
METHOD m_brueltfr emptyStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
METHOD m_brueltfr removeStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
METHOD m_htpnuxlo decreaseStack (I)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 count
METHOD m_xwjsgxrp getStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
CLASS C_ecqzlsuf
CLASS C_ecqzlsuf BlockSingleStackInventory
METHOD m_ejhbwvaa getBlockEntity ()Lnet/minecraft/unmapped/C_kvegafmh;

2 comments on commit d9303b7

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit d9303b7, 37 file(s) were updated with 477 line(s) added and 486 removed compared to the latest Quilt Mappings version.

View the diff here (1/2):
Only in namedSrc/net/minecraft/block: BlockRegistryKeys.java
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-02-06 22:42:24.332751675 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-02-06 22:41:14.832688261 +0000
@@ -40,8 +40,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_pyxrohya;
-import net.minecraft.unmapped.C_qiypfnai;
 import net.minecraft.util.Color;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.BlockPos;
@@ -3883,7 +3881,7 @@
     * @mapping {@literal named PUMPKIN Lnet/minecraft/block/Blocks;PUMPKIN:Lnet/minecraft/block/Block;}
     */
    public static final Block PUMPKIN = register(
-      C_pyxrohya.PUMPKIN,
+      BlockRegistryKeys.PUMPKIN,
       new PumpkinBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.ORANGE)
@@ -3898,7 +3896,7 @@
     * @mapping {@literal named MELON Lnet/minecraft/block/Blocks;MELON:Lnet/minecraft/block/Block;}
     */
    public static final Block MELON = register(
-      C_pyxrohya.MELON,
+      BlockRegistryKeys.MELON,
       new Block(AbstractBlock.Settings.create().mapColor(MapColor.LIME).strength(1.0F).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY))
    );
    /**
@@ -3906,10 +3904,10 @@
     * @mapping {@literal named ATTACHED_PUMPKIN_STEM Lnet/minecraft/block/Blocks;ATTACHED_PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
    public static final Block ATTACHED_PUMPKIN_STEM = register(
-      C_pyxrohya.ATTACHED_PUMPKIN_STEM,
+      BlockRegistryKeys.ATTACHED_PUMPKIN_STEM,
       new AttachedStemBlock(
-         C_pyxrohya.PUMPKIN_STEM,
-         C_pyxrohya.PUMPKIN,
+         BlockRegistryKeys.PUMPKIN_STEM,
+         BlockRegistryKeys.PUMPKIN,
          ItemKeys.PUMPKIN_SEEDS,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
@@ -3924,10 +3922,10 @@
     * @mapping {@literal named ATTACHED_MELON_STEM Lnet/minecraft/block/Blocks;ATTACHED_MELON_STEM:Lnet/minecraft/block/Block;}
     */
    public static final Block ATTACHED_MELON_STEM = register(
-      C_pyxrohya.ATTACHED_MELON_STEM,
+      BlockRegistryKeys.ATTACHED_MELON_STEM,
       new AttachedStemBlock(
-         C_pyxrohya.MELON_STEM,
-         C_pyxrohya.MELON,
+         BlockRegistryKeys.MELON_STEM,
+         BlockRegistryKeys.MELON,
          ItemKeys.MELON_SEEDS,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
@@ -3942,10 +3940,10 @@
     * @mapping {@literal named PUMPKIN_STEM Lnet/minecraft/block/Blocks;PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
    public static final Block PUMPKIN_STEM = register(
-      C_pyxrohya.PUMPKIN_STEM,
+      BlockRegistryKeys.PUMPKIN_STEM,
       new StemBlock(
-         C_pyxrohya.PUMPKIN,
-         C_pyxrohya.ATTACHED_PUMPKIN_STEM,
+         BlockRegistryKeys.PUMPKIN,
+         BlockRegistryKeys.ATTACHED_PUMPKIN_STEM,
          ItemKeys.PUMPKIN_SEEDS,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
@@ -3961,10 +3959,10 @@
     * @mapping {@literal named MELON_STEM Lnet/minecraft/block/Blocks;MELON_STEM:Lnet/minecraft/block/Block;}
     */
    public static final Block MELON_STEM = register(
-      C_pyxrohya.MELON_STEM,
+      BlockRegistryKeys.MELON_STEM,
       new StemBlock(
-         C_pyxrohya.MELON,
-         C_pyxrohya.ATTACHED_MELON_STEM,
+         BlockRegistryKeys.MELON,
+         BlockRegistryKeys.ATTACHED_MELON_STEM,
          ItemKeys.MELON_SEEDS,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
@@ -11478,12 +11476,12 @@
     */
    public static final Block TRIAL_SPAWNER = register(
       "trial_spawner",
-      new C_qiypfnai(
+      new TrialSpawnerBlock(
          AbstractBlock.Settings.create()
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .requiresTool()
-            .luminance(state -> ((TrialSpawnerState)state.get(C_qiypfnai.f_eqxijsod)).m_cdvvkjen())
+            .luminance(state -> ((TrialSpawnerState)state.get(TrialSpawnerBlock.STATE)).getLuminance())
             .strength(50.0F)
             .sounds(BlockSoundGroup.BLOCK_TRIAL_SPAWNER_BREAK)
             .blockVision(Blocks::nonSolid)
diff -bur namedTargetSrc/net/minecraft/block/BlockTypes.java namedSrc/net/minecraft/block/BlockTypes.java
--- namedTargetSrc/net/minecraft/block/BlockTypes.java	2024-02-06 22:42:24.428751765 +0000
+++ namedSrc/net/minecraft/block/BlockTypes.java	2024-02-06 22:41:14.948688383 +0000
@@ -20,7 +20,6 @@
 import net.minecraft.block.sign.WallSignBlock;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_qiypfnai;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_pnbkhfnc}
@@ -246,7 +245,7 @@
       Registry.register(registry, "transparent", GlassBlock.CODEC);
       Registry.register(registry, "trapdoor", TrapdoorBlock.CODEC);
       Registry.register(registry, "trapped_chest", TrappedChestBlock.CODEC);
-      Registry.register(registry, "trial_spawner", C_qiypfnai.CODEC);
+      Registry.register(registry, "trial_spawner", TrialSpawnerBlock.CODEC);
       Registry.register(registry, "trip_wire_hook", TripwireHookBlock.CODEC);
       Registry.register(registry, "tripwire", TripwireBlock.CODEC);
       Registry.register(registry, "turtle_egg", TurtleEggBlock.CODEC);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-02-06 22:42:24.276751623 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-02-06 22:41:14.760688185 +0000
@@ -144,7 +144,7 @@
          } else {
             ItemStack lv3 = lv.getStack();
             if (!stack.isEmpty() && (lv3.isEmpty() || ItemStack.canCombine(lv3, stack) && lv3.getCount() < lv3.getMaxCount())) {
-               lv.m_faozmaju(DecoratedPotBlockEntity.C_qjewosgd.POSITIVE);
+               lv.wobble(DecoratedPotBlockEntity.WobbleType.POSITIVE);
                player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
                ItemStack lv4 = player.isCreative() ? stack.withCount(1) : stack.split(1);
                float f;
@@ -182,7 +182,7 @@
    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult result) {
       if (world.getBlockEntity(pos) instanceof DecoratedPotBlockEntity lv) {
          world.playSound(null, pos, SoundEvents.BLOCK_DECORATED_POT_INSERT_FAIL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-         lv.m_faozmaju(DecoratedPotBlockEntity.C_qjewosgd.NEGATIVE);
+         lv.wobble(DecoratedPotBlockEntity.WobbleType.NEGATIVE);
          world.emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos);
          return ActionResult.SUCCESS;
       } else {
@@ -320,7 +320,7 @@
     */
    @Override
    public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) {
-      return world.getBlockEntity(pos) instanceof DecoratedPotBlockEntity lv ? lv.m_lfhantja() : super.getPickStack(world, pos, state);
+      return world.getBlockEntity(pos) instanceof DecoratedPotBlockEntity lv ? lv.asStack() : super.getPickStack(world, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-02-06 22:42:24.492751825 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-02-06 22:41:15.036688475 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CrafterBlock;
-import net.minecraft.client.gui.screen.ingame.CrafterScreen;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventories;
@@ -16,6 +15,7 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.registry.HolderLookup;
+import net.minecraft.screen.CrafterScreenHandler;
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.text.Text;
@@ -139,7 +139,7 @@
     */
    @Override
    protected ScreenHandler createScreenHandler(int syncId, PlayerInventory playerInventory) {
-      return new CrafterScreen(syncId, playerInventory, this, this.propertyDelegate);
+      return new CrafterScreenHandler(syncId, playerInventory, this, this.propertyDelegate);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-02-06 22:42:24.448751783 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-02-06 22:41:14.972688408 +0000
@@ -2,8 +2,8 @@
 
 import java.util.stream.Stream;
 import net.minecraft.block.BlockState;
-import net.minecraft.inventory.JukeboxInventory;
 import net.minecraft.inventory.LootableInventory;
+import net.minecraft.inventory.SingleStackInventory;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -25,7 +25,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_snnddtnv}
  * @mapping {@literal named net/minecraft/block/entity/DecoratedPotBlockEntity}
  */
-public class DecoratedPotBlockEntity extends BlockEntity implements LootableInventory, JukeboxInventory.C_ecqzlsuf {
+public class DecoratedPotBlockEntity extends BlockEntity implements LootableInventory, SingleStackInventory.BlockSingleStackInventory {
    /**
     * @mapping {@literal hashed f_lkaissqj Lnet/minecraft/unmapped/C_snnddtnv;f_lkaissqj:Ljava/lang/String;}
     * @mapping {@literal named SHERDS_KEY Lnet/minecraft/block/entity/DecoratedPotBlockEntity;SHERDS_KEY:Ljava/lang/String;}
@@ -37,19 +37,21 @@
     */
    public static final String ITEM_KEY = "item";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yprzpvoh Lnet/minecraft/unmapped/C_snnddtnv;f_yprzpvoh:I}
+    * @mapping {@literal named POT_WOBBLES_EVENT Lnet/minecraft/block/entity/DecoratedPotBlockEntity;POT_WOBBLES_EVENT:I}
     */
-   public static final int f_yprzpvoh = 1;
+   public static final int POT_WOBBLES_EVENT = 1;
    /**
     * @mapping {@literal hashed f_bsjlvxwm Lnet/minecraft/unmapped/C_snnddtnv;f_bsjlvxwm:J}
     * @mapping {@literal named lastWobbleTime Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lastWobbleTime:J}
     */
    public long lastWobbleTime;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uumxnicq Lnet/minecraft/unmapped/C_snnddtnv;f_uumxnicq:Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;}
+    * @mapping {@literal named lastWobbleType Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lastWobbleType:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;}
     */
    @Nullable
-   public DecoratedPotBlockEntity.C_qjewosgd f_uumxnicq;
+   public DecoratedPotBlockEntity.WobbleType lastWobbleType;
    /**
     * @mapping {@literal hashed f_ntlmymra Lnet/minecraft/unmapped/C_snnddtnv;f_ntlmymra:Lnet/minecraft/unmapped/C_snnddtnv$C_gxhwrzck;}
     * @mapping {@literal named sherds Lnet/minecraft/block/entity/DecoratedPotBlockEntity;sherds:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$Sherds;}
@@ -62,10 +64,10 @@
    private ItemStack stack = ItemStack.EMPTY;
    /**
     * @mapping {@literal hashed f_dwwkwusv Lnet/minecraft/unmapped/C_snnddtnv;f_dwwkwusv:Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named identifier Lnet/minecraft/block/entity/DecoratedPotBlockEntity;identifier:Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named lootTableId Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTableId:Lnet/minecraft/util/Identifier;}
     */
    @Nullable
-   protected Identifier identifier;
+   protected Identifier lootTableId;
    /**
     * @mapping {@literal hashed f_skwmykui Lnet/minecraft/unmapped/C_snnddtnv;f_skwmykui:J}
     * @mapping {@literal named lootTableSeed Lnet/minecraft/block/entity/DecoratedPotBlockEntity;lootTableSeed:J}
@@ -150,9 +152,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lfhantja Lnet/minecraft/unmapped/C_snnddtnv;m_lfhantja()Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named asStack Lnet/minecraft/block/entity/DecoratedPotBlockEntity;asStack()Lnet/minecraft/item/ItemStack;}
     */
-   public ItemStack m_lfhantja() {
+   public ItemStack asStack() {
       return m_qjeeptjd(this.sherds);
    }
 
@@ -173,7 +176,7 @@
    @Nullable
    @Override
    public Identifier getLootTableId() {
-      return this.identifier;
+      return this.lootTableId;
    }
 
    /**
@@ -181,7 +184,7 @@
     */
    @Override
    public void setLootTableId(@Nullable Identifier id) {
-      this.identifier = id;
+      this.lootTableId = id;
    }
 
    /**
@@ -241,11 +244,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_faozmaju Lnet/minecraft/unmapped/C_snnddtnv;m_faozmaju(Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;)V}
+    * @mapping {@literal named wobble Lnet/minecraft/block/entity/DecoratedPotBlockEntity;wobble(Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;)V}
     */
-   public void m_faozmaju(DecoratedPotBlockEntity.C_qjewosgd arg) {
+   public void wobble(DecoratedPotBlockEntity.WobbleType wobbleType) {
       if (this.world != null && !this.world.isClient()) {
-         this.world.addSyncedBlockEvent(this.getPos(), this.getCachedState().getBlock(), 1, arg.ordinal());
+         this.world.addSyncedBlockEvent(this.getPos(), this.getCachedState().getBlock(), 1, wobbleType.ordinal());
       }
    }
 
@@ -254,9 +258,9 @@
     */
    @Override
    public boolean onSyncedBlockEvent(int type, int data) {
-      if (this.world != null && type == 1 && data >= 0 && data < DecoratedPotBlockEntity.C_qjewosgd.values().length) {
+      if (this.world != null && type == 1 && data >= 0 && data < DecoratedPotBlockEntity.WobbleType.values().length) {
          this.lastWobbleTime = this.world.getTime();
-         this.f_uumxnicq = DecoratedPotBlockEntity.C_qjewosgd.values()[data];
+         this.lastWobbleType = DecoratedPotBlockEntity.WobbleType.values()[data];
          return true;
       } else {
          return super.onSyncedBlockEvent(type, data);
@@ -264,35 +268,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_snnddtnv$C_qjewosgd}
-    * @mapping {@literal named net/minecraft/block/entity/DecoratedPotBlockEntity$C_qjewosgd}
-    */
-   public static enum C_qjewosgd {
-      /**
-       * @mapping {@literal hashed f_qahhyjjo Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;f_qahhyjjo:Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;}
-       * @mapping {@literal named POSITIVE Lnet/minecraft/block/entity/DecoratedPotBlockEntity$C_qjewosgd;POSITIVE:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$C_qjewosgd;}
-       */
-      POSITIVE(7),
-      /**
-       * @mapping {@literal hashed f_tkxkomzn Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;f_tkxkomzn:Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;}
-       * @mapping {@literal named NEGATIVE Lnet/minecraft/block/entity/DecoratedPotBlockEntity$C_qjewosgd;NEGATIVE:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$C_qjewosgd;}
-       */
-      NEGATIVE(10);
-
-      /**
-       * Mapping not found
-       */
-      public final int f_dwazkvpc;
-
-      /**
-       * Mapping not found
-       */
-      private C_qjewosgd(int j) {
-         this.f_dwazkvpc = j;
-      }
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_snnddtnv$C_gxhwrzck}
     * @mapping {@literal named net/minecraft/block/entity/DecoratedPotBlockEntity$Sherds}
     */
@@ -355,4 +330,35 @@
          }
       }
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_snnddtnv$C_qjewosgd}
+    * @mapping {@literal named net/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType}
+    */
+   public static enum WobbleType {
+      /**
+       * @mapping {@literal hashed f_qahhyjjo Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;f_qahhyjjo:Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;}
+       * @mapping {@literal named POSITIVE Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;POSITIVE:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;}
+       */
+      POSITIVE(7),
+      /**
+       * @mapping {@literal hashed f_tkxkomzn Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;f_tkxkomzn:Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;}
+       * @mapping {@literal named NEGATIVE Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;NEGATIVE:Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;}
+       */
+      NEGATIVE(10);
+
+      /**
+       * @mapping {@literal hashed f_dwazkvpc Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;f_dwazkvpc:I}
+       * @mapping {@literal named duration Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;duration:I}
+       */
+      public final int duration;
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_snnddtnv$C_qjewosgd;<init>(Ljava/lang/String;II)V}
+       * @mapping {@literal named <init> Lnet/minecraft/block/entity/DecoratedPotBlockEntity$WobbleType;<init>(Ljava/lang/String;II)V}
+       */
+      private WobbleType(int duration) {
+         this.duration = duration;
+      }
+   }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-02-06 22:42:24.436751773 +0000
+++ namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-02-06 22:41:14.960688395 +0000
@@ -7,7 +7,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.JukeboxInventory;
+import net.minecraft.inventory.SingleStackInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.MusicDiscItem;
@@ -29,7 +29,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_qgqgzpda}
  * @mapping {@literal named net/minecraft/block/entity/JukeboxBlockEntity}
  */
-public class JukeboxBlockEntity extends BlockEntity implements Clearable, JukeboxInventory.C_ecqzlsuf {
+public class JukeboxBlockEntity extends BlockEntity implements Clearable, SingleStackInventory.BlockSingleStackInventory {
    /**
     * @mapping {@literal hashed f_nbgnaxln Lnet/minecraft/unmapped/C_qgqgzpda;f_nbgnaxln:I}
     * @mapping {@literal named SONG_END_PADDING Lnet/minecraft/block/entity/JukeboxBlockEntity;SONG_END_PADDING:I}
@@ -268,7 +268,7 @@
          BlockPos lv = this.getPos();
          ItemStack lv2 = this.getStack();
          if (!lv2.isEmpty()) {
-            this.emptyStack();
+            this.removeStack();
             Vec3d lv3 = Vec3d.offset(lv, 0.5, 1.01, 0.5).addRandom(this.world.random, 0.7F);
             ItemStack lv4 = lv2.copy();
             ItemEntity lv5 = new ItemEntity(this.world, lv3.getX(), lv3.getY(), lv3.getZ(), lv4);
diff -bur namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-02-06 22:42:24.348751690 +0000
+++ namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-02-06 22:41:14.856688286 +0000
@@ -3,12 +3,12 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.Spawner;
 import net.minecraft.entity.EntityType;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.MobSpawnerEntry;
@@ -20,7 +20,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_qtiirvxr}
  * @mapping {@literal named net/minecraft/block/entity/MobSpawnerBlockEntity}
  */
-public class MobSpawnerBlockEntity extends BlockEntity implements C_xheeywhc {
+public class MobSpawnerBlockEntity extends BlockEntity implements Spawner {
    /**
     * @mapping {@literal hashed f_hdywupga Lnet/minecraft/unmapped/C_qtiirvxr;f_hdywupga:Lnet/minecraft/unmapped/C_pyejmcbw;}
     * @mapping {@literal named logic Lnet/minecraft/block/entity/MobSpawnerBlockEntity;logic:Lnet/minecraft/world/MobSpawnerLogic;}
@@ -124,12 +124,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_aohplshh Lnet/minecraft/unmapped/C_qtiirvxr;m_aohplshh(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V}
-    * @mapping {@literal named m_aohplshh Lnet/minecraft/block/entity/MobSpawnerBlockEntity;m_aohplshh(Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/random/RandomGenerator;)V}
+    * Mapping not found
     */
    @Override
-   public void m_aohplshh(EntityType<?> arg, RandomGenerator random) {
-      this.logic.setEntityId(arg, this.world, random, this.pos);
+   public void setEntityType(EntityType<?> entityType, RandomGenerator random) {
+      this.logic.setEntityId(entityType, this.world, random, this.pos);
       this.markDirty();
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-02-06 22:42:24.504751836 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-02-06 22:41:15.056688497 +0000
@@ -55,12 +55,13 @@
    @Nullable
    private static LoadingCache<String, CompletableFuture<Optional<GameProfile>>> userCache;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cylawnts Lnet/minecraft/unmapped/C_vrhaavsg;f_cylawnts:Ljava/util/concurrent/Executor;}
+    * @mapping {@literal named NONNULL_EXECUTOR Lnet/minecraft/block/entity/SkullBlockEntity;NONNULL_EXECUTOR:Ljava/util/concurrent/Executor;}
     */
-   private static final Executor f_cylawnts = runnable -> {
+   private static final Executor NONNULL_EXECUTOR = task -> {
       Executor executor = SkullBlockEntity.executor;
       if (executor != null) {
-         executor.execute(runnable);
+         executor.execute(task);
       }
    };
    /**
@@ -113,7 +114,7 @@
                public CompletableFuture<Optional<GameProfile>> load(String string) {
                   return booleanSupplier.getAsBoolean()
                      ? CompletableFuture.completedFuture(Optional.empty())
-                     : SkullBlockEntity.m_eoxjszqd(string, services, booleanSupplier);
+                     : SkullBlockEntity.fetchProfile(string, services, booleanSupplier);
                }
             }
          );
@@ -130,11 +131,11 @@
 
    /**
     * @mapping {@literal hashed m_eoxjszqd Lnet/minecraft/unmapped/C_vrhaavsg;m_eoxjszqd(Ljava/lang/String;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;}
-    * @mapping {@literal named m_eoxjszqd Lnet/minecraft/block/entity/SkullBlockEntity;m_eoxjszqd(Ljava/lang/String;Lnet/minecraft/server/Services;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named fetchProfile Lnet/minecraft/block/entity/SkullBlockEntity;fetchProfile(Ljava/lang/String;Lnet/minecraft/server/Services;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;}
     */
-   static CompletableFuture<Optional<GameProfile>> m_eoxjszqd(String username, Services services, BooleanSupplier booleanSupplier) {
+   static CompletableFuture<Optional<GameProfile>> fetchProfile(String username, Services services, BooleanSupplier isCacheNull) {
       return services.userCache().findByNameAsync(username).thenApplyAsync(gameProfile -> {
-         if (gameProfile.isPresent() && !booleanSupplier.getAsBoolean()) {
+         if (gameProfile.isPresent() && !isCacheNull.getAsBoolean()) {
             UUID uUID = ((GameProfile)gameProfile.get()).getId();
             ProfileResult profileResult = services.sessionService().fetchProfile(uUID, true);
             return profileResult != null ? Optional.ofNullable(profileResult.profile()) : gameProfile;
@@ -254,10 +255,10 @@
     */
    private void loadOwnerProperties() {
       if (this.owner != null && !Util.isBlank(this.owner.getName()) && !hasTextures(this.owner)) {
-         m_vsbyiyln(this.owner.getName()).thenAcceptAsync(optional -> {
-            this.owner = (GameProfile)optional.orElse(this.owner);
+         fetchProfile(this.owner.getName()).thenAcceptAsync(profile -> {
+            this.owner = (GameProfile)profile.orElse(this.owner);
             this.markDirty();
-         }, f_cylawnts);
+         }, NONNULL_EXECUTOR);
       } else {
          this.markDirty();
       }
@@ -265,10 +266,10 @@
 
    /**
     * @mapping {@literal hashed m_rrmjdeiy Lnet/minecraft/unmapped/C_vrhaavsg;m_rrmjdeiy(Lnet/minecraft/unmapped/C_hhlwcnih;)Lcom/mojang/authlib/GameProfile;}
-    * @mapping {@literal named m_rrmjdeiy Lnet/minecraft/block/entity/SkullBlockEntity;m_rrmjdeiy(Lnet/minecraft/nbt/NbtCompound;)Lcom/mojang/authlib/GameProfile;}
+    * @mapping {@literal named getProfile Lnet/minecraft/block/entity/SkullBlockEntity;getProfile(Lnet/minecraft/nbt/NbtCompound;)Lcom/mojang/authlib/GameProfile;}
     */
    @Nullable
-   public static GameProfile m_rrmjdeiy(NbtCompound nbt) {
+   public static GameProfile getProfile(NbtCompound nbt) {
       if (nbt.contains("SkullOwner", NbtElement.COMPOUND_TYPE)) {
          return NbtHelper.toGameProfile(nbt.getCompound("SkullOwner"));
       } else {
@@ -276,7 +277,7 @@
             String string = nbt.getString("SkullOwner");
             if (!Util.isBlank(string)) {
                nbt.remove("SkullOwner");
-               m_ebobyxzo(nbt, string);
+               resolveSkullOwner(nbt, string);
             }
          }
 
@@ -286,34 +287,35 @@
 
    /**
     * @mapping {@literal hashed m_btgpxhvt Lnet/minecraft/unmapped/C_vrhaavsg;m_btgpxhvt(Lnet/minecraft/unmapped/C_hhlwcnih;)V}
-    * @mapping {@literal named m_btgpxhvt Lnet/minecraft/block/entity/SkullBlockEntity;m_btgpxhvt(Lnet/minecraft/nbt/NbtCompound;)V}
+    * @mapping {@literal named resolveSkullOwner Lnet/minecraft/block/entity/SkullBlockEntity;resolveSkullOwner(Lnet/minecraft/nbt/NbtCompound;)V}
     */
-   public static void m_btgpxhvt(NbtCompound nbt) {
+   public static void resolveSkullOwner(NbtCompound nbt) {
       String string = nbt.getString("SkullOwner");
       if (!Util.isBlank(string)) {
-         m_ebobyxzo(nbt, string);
+         resolveSkullOwner(nbt, string);
       }
    }
 
    /**
     * @mapping {@literal hashed m_ebobyxzo Lnet/minecraft/unmapped/C_vrhaavsg;m_ebobyxzo(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)V}
-    * @mapping {@literal named m_ebobyxzo Lnet/minecraft/block/entity/SkullBlockEntity;m_ebobyxzo(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;)V}
+    * @mapping {@literal named resolveSkullOwner Lnet/minecraft/block/entity/SkullBlockEntity;resolveSkullOwner(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;)V}
     */
-   private static void m_ebobyxzo(NbtCompound nbt, String string) {
-      m_vsbyiyln(string)
+   private static void resolveSkullOwner(NbtCompound nbt, String skullOwner) {
+      fetchProfile(skullOwner)
          .thenAccept(
-            optional -> nbt.put(
-                  "SkullOwner", NbtHelper.writeGameProfile(new NbtCompound(), (GameProfile)optional.orElse(new GameProfile(Util.NIL_UUID, string)))
+            profile -> nbt.put(
+                  "SkullOwner", NbtHelper.writeGameProfile(new NbtCompound(), (GameProfile)profile.orElse(new GameProfile(Util.NIL_UUID, skullOwner)))
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vsbyiyln Lnet/minecraft/unmapped/C_vrhaavsg;m_vsbyiyln(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named fetchProfile Lnet/minecraft/block/entity/SkullBlockEntity;fetchProfile(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private static CompletableFuture<Optional<GameProfile>> m_vsbyiyln(String string) {
+   private static CompletableFuture<Optional<GameProfile>> fetchProfile(String name) {
       LoadingCache<String, CompletableFuture<Optional<GameProfile>>> loadingCache = userCache;
-      return loadingCache != null && PlayerEntity.m_kuclbyvl(string) ? loadingCache.getUnchecked(string) : CompletableFuture.completedFuture(Optional.empty());
+      return loadingCache != null && PlayerEntity.isValidUsername(name) ? loadingCache.getUnchecked(name) : CompletableFuture.completedFuture(Optional.empty());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-02-06 22:42:24.468751803 +0000
+++ namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-02-06 22:41:14.996688434 +0000
@@ -3,6 +3,8 @@
 import com.mojang.logging.LogUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Spawner;
+import net.minecraft.block.TrialSpawnerBlock;
 import net.minecraft.block.enums.TrialSpawnerState;
 import net.minecraft.entity.EntityType;
 import net.minecraft.nbt.NbtCompound;
@@ -10,12 +12,10 @@
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kkiexczn;
-import net.minecraft.unmapped.C_qiypfnai;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.EntityDetector;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 import org.slf4j.Logger;
 
@@ -23,16 +23,17 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_ndgqjckh}
  * @mapping {@literal named net/minecraft/block/entity/TrialSpawnerBlockEntity}
  */
-public class TrialSpawnerBlockEntity extends BlockEntity implements C_xheeywhc, C_jelkcvqk.C_onmhuuws {
+public class TrialSpawnerBlockEntity extends BlockEntity implements Spawner, TrialSpawnerLogic.TrialSpawner {
    /**
     * @mapping {@literal hashed f_dnhjtuzr Lnet/minecraft/unmapped/C_ndgqjckh;f_dnhjtuzr:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;LOGGER:Lorg/slf4j/Logger;}
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fhtosxqw Lnet/minecraft/unmapped/C_ndgqjckh;f_fhtosxqw:Lnet/minecraft/unmapped/C_jelkcvqk;}
+    * @mapping {@literal named spawnerLogic Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;spawnerLogic:Lnet/minecraft/world/TrialSpawnerLogic;}
     */
-   private C_jelkcvqk f_fhtosxqw;
+   private TrialSpawnerLogic spawnerLogic;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ndgqjckh;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -40,9 +41,9 @@
     */
    public TrialSpawnerBlockEntity(BlockPos pos, BlockState state) {
       super(BlockEntityType.TRIAL_SPAWNER, pos, state);
-      C_kkiexczn lv = C_kkiexczn.f_etrsolop;
-      C_kkiexczn.C_ztluwxut lv2 = C_kkiexczn.C_ztluwxut.f_upomikid;
-      this.f_fhtosxqw = new C_jelkcvqk(this, lv, lv2);
+      EntityDetector lv = EntityDetector.NON_CREATIVE_NON_SPECTATOR_PLAYERS;
+      EntityDetector.EntitySelector lv2 = EntityDetector.EntitySelector.WORLD_ENTITY_SELECTOR;
+      this.spawnerLogic = new TrialSpawnerLogic(this, lv, lv2);
    }
 
    /**
@@ -51,9 +52,9 @@
    @Override
    public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.readNbt(nbt, arg2);
-      this.f_fhtosxqw.m_hvfivtpr().parse(NbtOps.INSTANCE, nbt).resultOrPartial(LOGGER::error).ifPresent(arg -> this.f_fhtosxqw = arg);
+      this.spawnerLogic.getCodec().parse(NbtOps.INSTANCE, nbt).resultOrPartial(LOGGER::error).ifPresent(logic -> this.spawnerLogic = logic);
       if (this.world != null) {
-         this.m_wvpnseil();
+         this.updateListeners();
       }
    }
 
@@ -63,12 +64,12 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      this.f_fhtosxqw
-         .m_hvfivtpr()
-         .encodeStart(NbtOps.INSTANCE, this.f_fhtosxqw)
+      this.spawnerLogic
+         .getCodec()
+         .encodeStart(NbtOps.INSTANCE, this.spawnerLogic)
          .get()
-         .ifLeft(arg2x -> nbt.copyFrom((NbtCompound)arg2x))
-         .ifRight(partialResult -> LOGGER.warn("Failed to encode TrialSpawner {}", partialResult.message()));
+         .ifLeft(logicNbt -> nbt.copyFrom((NbtCompound)logicNbt))
+         .ifRight(error -> LOGGER.warn("Failed to encode TrialSpawner {}", error.message()));
    }
 
    /**
@@ -84,7 +85,7 @@
     */
    @Override
    public NbtCompound toSyncedNbt(HolderLookup.Provider arg) {
-      return this.f_fhtosxqw.m_uohhenov().m_nfqmvsor(this.getCachedState().get(C_qiypfnai.f_eqxijsod));
+      return this.spawnerLogic.getData().getSyncedNbt(this.getCachedState().get(TrialSpawnerBlock.STATE));
    }
 
    /**
@@ -96,47 +97,46 @@
    }
 
    /**
-    * @mapping {@literal hashed m_aohplshh Lnet/minecraft/unmapped/C_ndgqjckh;m_aohplshh(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V}
-    * @mapping {@literal named m_aohplshh Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;m_aohplshh(Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/random/RandomGenerator;)V}
+    * Mapping not found
     */
    @Override
-   public void m_aohplshh(EntityType<?> arg, RandomGenerator random) {
-      this.f_fhtosxqw.m_uohhenov().m_sccvkbao(this.f_fhtosxqw, random, arg);
+   public void setEntityType(EntityType<?> entityType, RandomGenerator random) {
+      this.spawnerLogic.getData().setEntityType(this.spawnerLogic, random, entityType);
       this.markDirty();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wvhkrgdu Lnet/minecraft/unmapped/C_ndgqjckh;m_wvhkrgdu()Lnet/minecraft/unmapped/C_jelkcvqk;}
+    * @mapping {@literal named getSpawnerLogic Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;getSpawnerLogic()Lnet/minecraft/world/TrialSpawnerLogic;}
     */
-   public C_jelkcvqk m_wvhkrgdu() {
-      return this.f_fhtosxqw;
+   public TrialSpawnerLogic getSpawnerLogic() {
+      return this.spawnerLogic;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public TrialSpawnerState m_khbvxtru() {
+   public TrialSpawnerState getState() {
       return !this.getCachedState().contains(Properties.TRIAL_SPAWNER_STATE)
          ? TrialSpawnerState.INACTIVE
          : this.getCachedState().get(Properties.TRIAL_SPAWNER_STATE);
    }
 
    /**
-    * @mapping {@literal hashed m_qubjusrv Lnet/minecraft/unmapped/C_ndgqjckh;m_qubjusrv(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)V}
-    * @mapping {@literal named m_qubjusrv Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;m_qubjusrv(Lnet/minecraft/world/World;Lnet/minecraft/block/enums/TrialSpawnerState;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qubjusrv(World world, TrialSpawnerState arg2) {
+   public void setState(World world, TrialSpawnerState state) {
       this.markDirty();
-      world.setBlockState(this.pos, this.getCachedState().with(Properties.TRIAL_SPAWNER_STATE, arg2));
+      world.setBlockState(this.pos, this.getCachedState().with(Properties.TRIAL_SPAWNER_STATE, state));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_wvpnseil() {
+   public void updateListeners() {
       this.markDirty();
       if (this.world != null) {
          this.world.updateListeners(this.pos, this.getCachedState(), this.getCachedState(), Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-02-06 22:42:24.488751821 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-02-06 22:41:15.032688471 +0000
@@ -1,21 +1,21 @@
 package net.minecraft.block.enums;
 
 import java.util.Optional;
+import net.minecraft.block.TrialSpawnerConfig;
+import net.minecraft.block.TrialSpawnerData;
 import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kkiexczn;
-import net.minecraft.unmapped.C_kxkfzuix;
-import net.minecraft.unmapped.C_pocjjnjk;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.EntityDetector;
 import net.minecraft.world.MobSpawnerEntry;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 
 /**
@@ -27,117 +27,125 @@
     * @mapping {@literal hashed f_tvtbxuax Lnet/minecraft/unmapped/C_mefvrcdp;f_tvtbxuax:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named INACTIVE Lnet/minecraft/block/enums/TrialSpawnerState;INACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   INACTIVE("inactive", 0, TrialSpawnerState.C_bccyitsl.f_fqijyvaw, -1.0, false),
+   INACTIVE("inactive", 0, TrialSpawnerState.ParticleEmitter.NONE, -1.0, false),
    /**
     * @mapping {@literal hashed f_ktinwycx Lnet/minecraft/unmapped/C_mefvrcdp;f_ktinwycx:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named WAITING_FOR_PLAYERS Lnet/minecraft/block/enums/TrialSpawnerState;WAITING_FOR_PLAYERS:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   WAITING_FOR_PLAYERS("waiting_for_players", 4, TrialSpawnerState.C_bccyitsl.f_niudltvq, 200.0, true),
+   WAITING_FOR_PLAYERS("waiting_for_players", 4, TrialSpawnerState.ParticleEmitter.WAITING, 200.0, true),
    /**
     * @mapping {@literal hashed f_iqghkjqp Lnet/minecraft/unmapped/C_mefvrcdp;f_iqghkjqp:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named ACTIVE Lnet/minecraft/block/enums/TrialSpawnerState;ACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   ACTIVE("active", 8, TrialSpawnerState.C_bccyitsl.f_ibbxvdpf, 1000.0, true),
+   ACTIVE("active", 8, TrialSpawnerState.ParticleEmitter.ACTIVE, 1000.0, true),
    /**
     * @mapping {@literal hashed f_abkbnpup Lnet/minecraft/unmapped/C_mefvrcdp;f_abkbnpup:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named WAITING_FOR_REWARD_EJECTION Lnet/minecraft/block/enums/TrialSpawnerState;WAITING_FOR_REWARD_EJECTION:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   WAITING_FOR_REWARD_EJECTION("waiting_for_reward_ejection", 8, TrialSpawnerState.C_bccyitsl.f_niudltvq, -1.0, false),
+   WAITING_FOR_REWARD_EJECTION("waiting_for_reward_ejection", 8, TrialSpawnerState.ParticleEmitter.WAITING, -1.0, false),
    /**
     * @mapping {@literal hashed f_mbsfnwru Lnet/minecraft/unmapped/C_mefvrcdp;f_mbsfnwru:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named EJECTING_REWARD Lnet/minecraft/block/enums/TrialSpawnerState;EJECTING_REWARD:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   EJECTING_REWARD("ejecting_reward", 8, TrialSpawnerState.C_bccyitsl.f_niudltvq, -1.0, false),
+   EJECTING_REWARD("ejecting_reward", 8, TrialSpawnerState.ParticleEmitter.WAITING, -1.0, false),
    /**
     * @mapping {@literal hashed f_fazsykji Lnet/minecraft/unmapped/C_mefvrcdp;f_fazsykji:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named COOLDOWN Lnet/minecraft/block/enums/TrialSpawnerState;COOLDOWN:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   COOLDOWN("cooldown", 0, TrialSpawnerState.C_bccyitsl.f_kjgegjdt, -1.0, false);
+   COOLDOWN("cooldown", 0, TrialSpawnerState.ParticleEmitter.COOLDOWN, -1.0, false);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vmdjvapc Lnet/minecraft/unmapped/C_mefvrcdp;f_vmdjvapc:F}
+    * @mapping {@literal named SHUTTER_OPENING_DELAY Lnet/minecraft/block/enums/TrialSpawnerState;SHUTTER_OPENING_DELAY:F}
     */
-   private static final float f_vmdjvapc = 40.0F;
+   private static final float SHUTTER_OPENING_DELAY = 40.0F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ujehhhbc Lnet/minecraft/unmapped/C_mefvrcdp;f_ujehhhbc:I}
+    * @mapping {@literal named REWARD_EJECTION_DELAY Lnet/minecraft/block/enums/TrialSpawnerState;REWARD_EJECTION_DELAY:I}
     */
-   private static final int f_ujehhhbc = MathHelper.floor(30.0F);
+   private static final int REWARD_EJECTION_DELAY = MathHelper.floor(30.0F);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vlliqbyk Lnet/minecraft/unmapped/C_mefvrcdp;f_vlliqbyk:Ljava/lang/String;}
+    * @mapping {@literal named name Lnet/minecraft/block/enums/TrialSpawnerState;name:Ljava/lang/String;}
     */
-   private final String f_vlliqbyk;
+   private final String name;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mgbthnrg Lnet/minecraft/unmapped/C_mefvrcdp;f_mgbthnrg:I}
+    * @mapping {@literal named luminance Lnet/minecraft/block/enums/TrialSpawnerState;luminance:I}
     */
-   private final int f_mgbthnrg;
+   private final int luminance;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_eszkuyea Lnet/minecraft/unmapped/C_mefvrcdp;f_eszkuyea:D}
+    * @mapping {@literal named entityRotationSpeed Lnet/minecraft/block/enums/TrialSpawnerState;entityRotationSpeed:D}
     */
-   private final double f_eszkuyea;
+   private final double entityRotationSpeed;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cvmyynjl Lnet/minecraft/unmapped/C_mefvrcdp;f_cvmyynjl:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+    * @mapping {@literal named particleEmitter Lnet/minecraft/block/enums/TrialSpawnerState;particleEmitter:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
     */
-   private final TrialSpawnerState.C_bccyitsl f_cvmyynjl;
+   private final TrialSpawnerState.ParticleEmitter particleEmitter;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_swntygwn Lnet/minecraft/unmapped/C_mefvrcdp;f_swntygwn:Z}
+    * @mapping {@literal named spawnCapable Lnet/minecraft/block/enums/TrialSpawnerState;spawnCapable:Z}
     */
-   private final boolean f_swntygwn;
+   private final boolean spawnCapable;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mefvrcdp;<init>(Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;DZ)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/enums/TrialSpawnerState;<init>(Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;DZ)V}
     */
-   private TrialSpawnerState(String string2, int j, TrialSpawnerState.C_bccyitsl arg, double d, boolean bl) {
-      this.f_vlliqbyk = string2;
-      this.f_mgbthnrg = j;
-      this.f_cvmyynjl = arg;
-      this.f_eszkuyea = d;
-      this.f_swntygwn = bl;
+   private TrialSpawnerState(String name, int luminance, TrialSpawnerState.ParticleEmitter particleEmitter, double entityRotationSpeed, boolean spawnCapable) {
+      this.name = name;
+      this.luminance = luminance;
+      this.particleEmitter = particleEmitter;
+      this.entityRotationSpeed = entityRotationSpeed;
+      this.spawnCapable = spawnCapable;
    }
 
    /**
     * @mapping {@literal hashed m_bkyjhsim Lnet/minecraft/unmapped/C_mefvrcdp;m_bkyjhsim(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_mefvrcdp;}
-    * @mapping {@literal named m_bkyjhsim Lnet/minecraft/block/enums/TrialSpawnerState;m_bkyjhsim(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/server/world/ServerWorld;)Lnet/minecraft/block/enums/TrialSpawnerState;}
+    * @mapping {@literal named tick Lnet/minecraft/block/enums/TrialSpawnerState;tick(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/TrialSpawnerLogic;Lnet/minecraft/server/world/ServerWorld;)Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   TrialSpawnerState m_bkyjhsim(BlockPos pos, C_jelkcvqk arg2, ServerWorld world) {
-      C_kxkfzuix lv = arg2.m_uohhenov();
-      C_pocjjnjk lv2 = arg2.m_xxjyblvm();
-      C_kkiexczn lv3 = arg2.m_bfmdqsfz();
-      C_kkiexczn.C_ztluwxut lv4 = arg2.m_ykbnfxwa();
+   TrialSpawnerState tick(BlockPos pos, TrialSpawnerLogic spawnerLogic, ServerWorld world) {
+      TrialSpawnerData lv = spawnerLogic.getData();
+      TrialSpawnerConfig lv2 = spawnerLogic.getConfig();
+      EntityDetector lv3 = spawnerLogic.getPlayerDetector();
+      EntityDetector.EntitySelector lv4 = spawnerLogic.getPlayerDetectionSelector();
       TrialSpawnerState var10000;
       switch (this) {
          case INACTIVE:
-            var10000 = lv.m_mnonaikc(arg2, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
+            var10000 = lv.getOrCreateDisplayEntity(spawnerLogic, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
             break;
          case WAITING_FOR_PLAYERS:
-            if (!lv.m_lqfpmalh()) {
+            if (!lv.hasSpawnData()) {
                var10000 = INACTIVE;
             } else {
-               lv.m_hqnuaozt(world, pos, lv3, lv4, lv2.requiredPlayerRange());
+               lv.detectPlayers(world, pos, lv3, lv4, lv2.requiredPlayerRange());
                var10000 = lv.registeredPlayers.isEmpty() ? this : ACTIVE;
             }
             break;
          case ACTIVE:
-            if (!lv.m_lqfpmalh()) {
+            if (!lv.hasSpawnData()) {
                var10000 = INACTIVE;
             } else {
-               int i = lv.m_ncimrtbx(pos);
-               lv.m_hqnuaozt(world, pos, lv3, lv4, lv2.requiredPlayerRange());
-               if (lv.m_rdtrxuhq(lv2, i)) {
-                  if (lv.m_lptaqeuw()) {
-                     lv.cooldownEndsAt = world.getTime() + (long)lv2.targetCooldownLength();
+               int i = lv.getAdditionalPlayers(pos);
+               lv.detectPlayers(world, pos, lv3, lv4, lv2.requiredPlayerRange());
+               if (lv.hasSpawnedAllMobs(lv2, i)) {
+                  if (lv.areMobsDead()) {
+                     lv.cooldownEndTime = world.getTime() + (long)lv2.targetCooldownLength();
                      lv.totalMobsSpawned = 0;
-                     lv.nextMobSpawnsAt = 0L;
+                     lv.nextMobSpawnTime = 0L;
                      var10000 = WAITING_FOR_REWARD_EJECTION;
                      break;
                   }
-               } else if (lv.m_npuvzoxl(world, lv2, i)) {
-                  arg2.m_aakzgwdf(world, pos).ifPresent(uuid -> {
+               } else if (lv.isReadyToSpawnNewMobs(world, lv2, i)) {
+                  spawnerLogic.spawnMob(world, pos).ifPresent(uuid -> {
                      lv.currentMobs.add(uuid);
                      lv.totalMobsSpawned++;
-                     lv.nextMobSpawnsAt = world.getTime() + (long)lv2.ticksBetweenSpawn();
-                     lv.f_tlbkcemq.getOrEmpty(world.getRandom()).ifPresent(arg3x -> {
-                        lv.spawnData = Optional.of((MobSpawnerEntry)arg3x.getData());
-                        arg2.m_zmvyuvfy();
+                     lv.nextMobSpawnTime = world.getTime() + (long)lv2.ticksBetweenSpawn();
+                     lv.spawnDataPool.getOrEmpty(world.getRandom()).ifPresent(spawnData -> {
+                        lv.spawnData = Optional.of((MobSpawnerEntry)spawnData.getData());
+                        spawnerLogic.updateListeners();
                      });
                   });
                }
@@ -146,7 +154,7 @@
             }
             break;
          case WAITING_FOR_REWARD_EJECTION:
-            if (lv.m_phbcnwhj(world, lv2, 40.0F)) {
+            if (lv.isReadyToOpenShutter(world, lv2, 40.0F)) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER, SoundCategory.BLOCKS);
                var10000 = EJECTING_REWARD;
             } else {
@@ -154,7 +162,7 @@
             }
             break;
          case EJECTING_REWARD:
-            if (!lv.m_kjmtebfw(world, lv2, (float)f_ujehhhbc)) {
+            if (!lv.isReadyToEjectReward(world, lv2, (float)REWARD_EJECTION_DELAY)) {
                var10000 = this;
             } else if (lv.registeredPlayers.isEmpty()) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER, SoundCategory.BLOCKS);
@@ -165,14 +173,14 @@
                   lv.ejectingLootTable = lv2.lootTablesToEject().getDataOrEmpty(world.getRandom());
                }
 
-               lv.ejectingLootTable.ifPresent(arg4 -> arg2.m_ggqvmzns(world, pos, arg4));
+               lv.ejectingLootTable.ifPresent(lootTable -> spawnerLogic.ejectLoot(world, pos, lootTable));
                lv.registeredPlayers.remove(lv.registeredPlayers.iterator().next());
                var10000 = this;
             }
             break;
          case COOLDOWN:
-            if (lv.m_xhldgvye(world)) {
-               lv.cooldownEndsAt = 0L;
+            if (lv.isCooldownFinished(world)) {
+               lv.cooldownEndTime = 0L;
                var10000 = WAITING_FOR_PLAYERS;
             } else {
                var10000 = this;
@@ -186,39 +194,43 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cdvvkjen Lnet/minecraft/unmapped/C_mefvrcdp;m_cdvvkjen()I}
+    * @mapping {@literal named getLuminance Lnet/minecraft/block/enums/TrialSpawnerState;getLuminance()I}
     */
-   public int m_cdvvkjen() {
-      return this.f_mgbthnrg;
+   public int getLuminance() {
+      return this.luminance;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bakqsrqc Lnet/minecraft/unmapped/C_mefvrcdp;m_bakqsrqc()D}
+    * @mapping {@literal named getEntityRotationSpeed Lnet/minecraft/block/enums/TrialSpawnerState;getEntityRotationSpeed()D}
     */
-   public double m_bakqsrqc() {
-      return this.f_eszkuyea;
+   public double getEntityRotationSpeed() {
+      return this.entityRotationSpeed;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lbcodxhm Lnet/minecraft/unmapped/C_mefvrcdp;m_lbcodxhm()Z}
+    * @mapping {@literal named hasRotatingEntity Lnet/minecraft/block/enums/TrialSpawnerState;hasRotatingEntity()Z}
     */
-   public boolean m_lbcodxhm() {
-      return this.f_eszkuyea >= 0.0;
+   public boolean hasRotatingEntity() {
+      return this.entityRotationSpeed >= 0.0;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ucdxdqvw Lnet/minecraft/unmapped/C_mefvrcdp;m_ucdxdqvw()Z}
+    * @mapping {@literal named isCapableOfSpawning Lnet/minecraft/block/enums/TrialSpawnerState;isCapableOfSpawning()Z}
     */
-   public boolean m_ucdxdqvw() {
-      return this.f_swntygwn;
+   public boolean isCapableOfSpawning() {
+      return this.spawnCapable;
    }
 
    /**
     * @mapping {@literal hashed m_epcfmecd Lnet/minecraft/unmapped/C_mefvrcdp;m_epcfmecd(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named m_epcfmecd Lnet/minecraft/block/enums/TrialSpawnerState;m_epcfmecd(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named emitParticle Lnet/minecraft/block/enums/TrialSpawnerState;emitParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public void m_epcfmecd(World world, BlockPos pos) {
-      this.f_cvmyynjl.emit(world, world.getRandom(), pos);
+   public void emitParticle(World world, BlockPos pos) {
+      this.particleEmitter.emit(world, world.getRandom(), pos);
    }
 
    /**
@@ -226,117 +238,127 @@
     */
    @Override
    public String asString() {
-      return this.f_vlliqbyk;
+      return this.name;
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_bccyitsl}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_bccyitsl}
-    */
-   interface C_bccyitsl {
-      /**
-       * Mapping not found
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_vevghdwi}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds}
        */
-      TrialSpawnerState.C_bccyitsl f_fqijyvaw = (world, random, pos) -> {
-      };
+   static class DisplayEntityRotationSpeeds {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gljtrkmn Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_gljtrkmn:D}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;NONE:D}
        */
-      TrialSpawnerState.C_bccyitsl f_niudltvq = (world, random, pos) -> {
-         if (random.nextInt(2) == 0) {
-            Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
-            m_gdzvmyph(ParticleTypes.SMALL_FLAME, lv, world);
-         }
-      };
+      private static final double NONE = -1.0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gauzfeiw Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_gauzfeiw:D}
+       * @mapping {@literal named SLOW Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;SLOW:D}
        */
-      TrialSpawnerState.C_bccyitsl f_ibbxvdpf = (world, random, pos) -> {
-         Vec3d lv = pos.ofCenter().addRandom(random, 1.0F);
-         m_gdzvmyph(ParticleTypes.SMOKE, lv, world);
-         m_gdzvmyph(ParticleTypes.FLAME, lv, world);
-      };
+      private static final double SLOW = 200.0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_mscpicrf Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_mscpicrf:D}
+       * @mapping {@literal named FAST Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;FAST:D}
        */
-      TrialSpawnerState.C_bccyitsl f_kjgegjdt = (world, random, pos) -> {
-         Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
-         if (random.nextInt(3) == 0) {
-            m_gdzvmyph(ParticleTypes.SMOKE, lv, world);
-         }
-
-         if (world.getTime() % 20L == 0L) {
-            Vec3d lv2 = pos.ofCenter().add(0.0, 0.5, 0.0);
-            int i = world.getRandom().nextInt(4) + 20;
-
-            for (int j = 0; j < i; j++) {
-               m_gdzvmyph(ParticleTypes.SMOKE, lv2, world);
-            }
-         }
-      };
+      private static final double FAST = 1000.0;
 
       /**
-       * @mapping {@literal hashed m_gdzvmyph Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
-       * @mapping {@literal named m_gdzvmyph Lnet/minecraft/block/enums/TrialSpawnerState$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/world/World;)V}
+       * Mapping not found
        */
-      private static void m_gdzvmyph(DefaultParticleType arg, Vec3d arg2, World world) {
-         world.addParticle(arg, arg2.getX(), arg2.getY(), arg2.getZ(), 0.0, 0.0, 0.0);
+      private DisplayEntityRotationSpeeds() {
       }
-
-      /**
-       * @mapping {@literal hashed emit Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;emit(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-       * @mapping {@literal named emit Lnet/minecraft/block/enums/TrialSpawnerState$C_bccyitsl;emit(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;)V}
-       */
-      void emit(World world, RandomGenerator random, BlockPos pos);
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_vevghdwi}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_vevghdwi}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_zwrttbii}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$Luminance}
     */
-   static class C_vevghdwi {
+   static class Luminance {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ycxnnjlw Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_ycxnnjlw:I}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;NONE:I}
        */
-      private static final double f_gljtrkmn = -1.0;
+      private static final int NONE = 0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cmrzasvm Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_cmrzasvm:I}
+       * @mapping {@literal named LOW Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;LOW:I}
        */
-      private static final double f_gauzfeiw = 200.0;
+      private static final int LOW = 4;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cuofrvdp Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_cuofrvdp:I}
+       * @mapping {@literal named HIGH Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;HIGH:I}
        */
-      private static final double f_mscpicrf = 1000.0;
+      private static final int HIGH = 8;
 
       /**
        * Mapping not found
        */
-      private C_vevghdwi() {
+      private Luminance() {
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_zwrttbii}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_zwrttbii}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_bccyitsl}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$ParticleEmitter}
     */
-   static class C_zwrttbii {
+   interface ParticleEmitter {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_fqijyvaw Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_fqijyvaw:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;NONE:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_ycxnnjlw = 0;
+      TrialSpawnerState.ParticleEmitter NONE = (world, random, pos) -> {
+      };
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_niudltvq Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_niudltvq:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named WAITING Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;WAITING:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_cmrzasvm = 4;
+      TrialSpawnerState.ParticleEmitter WAITING = (world, random, pos) -> {
+         if (random.nextInt(2) == 0) {
+            Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
+            addParticle(ParticleTypes.SMALL_FLAME, lv, world);
+         }
+      };
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ibbxvdpf Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_ibbxvdpf:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named ACTIVE Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;ACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
+       */
+      TrialSpawnerState.ParticleEmitter ACTIVE = (world, random, pos) -> {
+         Vec3d lv = pos.ofCenter().addRandom(random, 1.0F);
+         addParticle(ParticleTypes.SMOKE, lv, world);
+         addParticle(ParticleTypes.FLAME, lv, world);
+      };
+      /**
+       * @mapping {@literal hashed f_kjgegjdt Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_kjgegjdt:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named COOLDOWN Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;COOLDOWN:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_cuofrvdp = 8;
+      TrialSpawnerState.ParticleEmitter COOLDOWN = (world, random, pos) -> {
+         Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
+         if (random.nextInt(3) == 0) {
+            addParticle(ParticleTypes.SMOKE, lv, world);
+         }
+
+         if (world.getTime() % 20L == 0L) {
+            Vec3d lv2 = pos.ofCenter().add(0.0, 0.5, 0.0);
+            int i = world.getRandom().nextInt(4) + 20;
+
+            for (int j = 0; j < i; j++) {
+               addParticle(ParticleTypes.SMOKE, lv2, world);
+            }
+         }
+      };
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_gdzvmyph Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
+       * @mapping {@literal named addParticle Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;addParticle(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/world/World;)V}
        */
-      private C_zwrttbii() {
+      private static void addParticle(DefaultParticleType particleType, Vec3d pos, World world) {
+         world.addParticle(particleType, pos.getX(), pos.getY(), pos.getZ(), 0.0, 0.0, 0.0);
       }
+
+      /**
+       * @mapping {@literal hashed emit Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;emit(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;)V}
+       * @mapping {@literal named emit Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;emit(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;)V}
+       */
+      void emit(World world, RandomGenerator random, BlockPos pos);
    }
 }

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (2/2):
diff -bur namedTargetSrc/net/minecraft/block/enums/VaultState.java namedSrc/net/minecraft/block/enums/VaultState.java
--- namedTargetSrc/net/minecraft/block/enums/VaultState.java	2024-02-06 22:42:24.336751679 +0000
+++ namedSrc/net/minecraft/block/enums/VaultState.java	2024-02-06 22:41:14.840688269 +0000
@@ -181,8 +181,8 @@
     * @mapping {@literal hashed m_ekopnsum Lnet/minecraft/unmapped/C_oocnpsfc;m_ekopnsum(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/unmapped/C_oocnpsfc;}
     * @mapping {@literal named m_ekopnsum Lnet/minecraft/block/enums/VaultState;m_ekopnsum(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/block/enums/VaultState;}
     */
-   private static VaultState m_ekopnsum(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5, double d) {
-      arg5.m_uflgzskl(world, pos, arg4, arg3, d);
+   private static VaultState m_ekopnsum(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5, double range) {
+      arg5.m_uflgzskl(world, pos, arg4, arg3, range);
       arg4.m_tluakpxm(world.getTime() + 20L);
       return arg5.m_jamphmeb() ? ACTIVE : INACTIVE;
    }
diff -bur namedTargetSrc/net/minecraft/block/SpawnerBlock.java namedSrc/net/minecraft/block/SpawnerBlock.java
--- namedTargetSrc/net/minecraft/block/SpawnerBlock.java	2024-02-06 22:42:24.476751810 +0000
+++ namedSrc/net/minecraft/block/SpawnerBlock.java	2024-02-06 22:41:15.012688450 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
@@ -89,6 +88,6 @@
       ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options, @Nullable DynamicRegistryManager registryManager
    ) {
       super.appendTooltip(stack, world, tooltip, options, registryManager);
-      C_xheeywhc.m_vysbdnfp(stack, tooltip, "SpawnData");
+      Spawner.appendTooltip(stack, tooltip, "SpawnData");
    }
 }
Only in namedSrc/net/minecraft/block: Spawner.java
Only in namedSrc/net/minecraft/block: TrialSpawnerBlock.java
Only in namedSrc/net/minecraft/block: TrialSpawnerConfig.java
Only in namedSrc/net/minecraft/block: TrialSpawnerData.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-02-06 22:42:24.388751727 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-02-06 22:41:14.812688240 +0000
@@ -1,224 +1,188 @@
 package net.minecraft.client.gui.screen.ingame;
 
-import net.minecraft.block.CrafterBlock;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.CraftingInventory;
-import net.minecraft.inventory.CraftingResultInventory;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.screen.ArrayPropertyDelegate;
-import net.minecraft.screen.PropertyDelegate;
-import net.minecraft.screen.ScreenHandler;
-import net.minecraft.screen.ScreenHandlerListener;
-import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.screen.CrafterScreenHandler;
+import net.minecraft.screen.slot.CrafterSlot;
 import net.minecraft.screen.slot.Slot;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_aklocaaw;
-import net.minecraft.unmapped.C_iwgoxhvo;
-import net.minecraft.world.World;
+import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 /**
- * @mapping {@literal hashed net/minecraft/unmapped/C_czkdrxgh}
+ * @mapping {@literal hashed net/minecraft/unmapped/C_ffdwiayx}
  * @mapping {@literal named net/minecraft/client/gui/screen/ingame/CrafterScreen}
  */
-public class CrafterScreen extends ScreenHandler implements ScreenHandlerListener {
+@Environment(EnvType.CLIENT)
+public class CrafterScreen extends HandledScreen<CrafterScreenHandler> {
    /**
-    * Mapping not found
-    */
-   protected static final int f_uuszxnri = 9;
-   /**
-    * Mapping not found
-    */
-   private static final int f_tcyulcmv = 9;
-   /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kqjpnlzo Lnet/minecraft/unmapped/C_ffdwiayx;f_kqjpnlzo:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named DISABLED_SLOT_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;DISABLED_SLOT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final int f_wvksesdo = 36;
+   private static final Identifier DISABLED_SLOT_TEXTURE = new Identifier("container/crafter/disabled_slot");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_klgzdzze Lnet/minecraft/unmapped/C_ffdwiayx;f_klgzdzze:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named POWERED_ARROW_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;POWERED_ARROW_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final int f_vidvtafw = 36;
+   private static final Identifier POWERED_ARROW_TEXTURE = new Identifier("container/crafter/powered_redstone");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fbkkgpfx Lnet/minecraft/unmapped/C_ffdwiayx;f_fbkkgpfx:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named UNPOWERED_ARROW_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;UNPOWERED_ARROW_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final int f_rvocmvxj = 45;
+   private static final Identifier UNPOWERED_ARROW_TEXTURE = new Identifier("container/crafter/unpowered_redstone");
    /**
-    * @mapping {@literal hashed f_yiamcegp Lnet/minecraft/unmapped/C_czkdrxgh;f_yiamcegp:Lnet/minecraft/unmapped/C_gxwuusgh;}
-    * @mapping {@literal named craftingResultInventory Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;craftingResultInventory:Lnet/minecraft/inventory/CraftingResultInventory;}
+    * @mapping {@literal hashed f_dolcfkge Lnet/minecraft/unmapped/C_ffdwiayx;f_dolcfkge:Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private final CraftingResultInventory craftingResultInventory = new CraftingResultInventory();
+   private static final Identifier TEXTURE = new Identifier("textures/gui/container/crafter.png");
    /**
-    * @mapping {@literal hashed f_pdiupkfn Lnet/minecraft/unmapped/C_czkdrxgh;f_pdiupkfn:Lnet/minecraft/unmapped/C_fwwsyhuv;}
-    * @mapping {@literal named propertyDelegate Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;propertyDelegate:Lnet/minecraft/screen/PropertyDelegate;}
+    * @mapping {@literal hashed f_gffwbkyz Lnet/minecraft/unmapped/C_ffdwiayx;f_gffwbkyz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named TOGGLEABLE_SLOT_TOOLTIP Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;TOGGLEABLE_SLOT_TOOLTIP:Lnet/minecraft/text/Text;}
     */
-   private final PropertyDelegate propertyDelegate;
+   private static final Text TOGGLEABLE_SLOT_TOOLTIP = Text.translatable("gui.togglable_slot");
    /**
-    * @mapping {@literal hashed f_dcjzsosk Lnet/minecraft/unmapped/C_czkdrxgh;f_dcjzsosk:Lnet/minecraft/unmapped/C_jzrpycqo;}
-    * @mapping {@literal named playerEntity Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;playerEntity:Lnet/minecraft/entity/player/PlayerEntity;}
+    * @mapping {@literal hashed f_zgxezuzc Lnet/minecraft/unmapped/C_ffdwiayx;f_zgxezuzc:Lnet/minecraft/unmapped/C_jzrpycqo;}
+    * @mapping {@literal named player Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;player:Lnet/minecraft/entity/player/PlayerEntity;}
     */
-   private final PlayerEntity playerEntity;
-   /**
-    * @mapping {@literal hashed f_veicmyyf Lnet/minecraft/unmapped/C_czkdrxgh;f_veicmyyf:Lnet/minecraft/unmapped/C_fcvwjvlq;}
-    * @mapping {@literal named inventory Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;inventory:Lnet/minecraft/inventory/RecipeInputInventory;}
-    */
-   private final RecipeInputInventory inventory;
+   private final PlayerEntity player;
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_czkdrxgh;<init>(ILnet/minecraft/unmapped/C_sxzqocrm;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;<init>(ILnet/minecraft/entity/player/PlayerInventory;)V}
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ffdwiayx;<init>(Lnet/minecraft/unmapped/C_czkdrxgh;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;<init>(Lnet/minecraft/screen/CrafterScreenHandler;Lnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/text/Text;)V}
     */
-   public CrafterScreen(int syncId, PlayerInventory playerInventory) {
-      super(ScreenHandlerType.CRAFTER_3X3, syncId);
-      this.playerEntity = playerInventory.player;
-      this.propertyDelegate = new ArrayPropertyDelegate(10);
-      this.inventory = new CraftingInventory(this, 3, 3);
-      this.m_zhwjtaii(playerInventory);
+   public CrafterScreen(CrafterScreenHandler handler, PlayerInventory inventory, Text title) {
+      super(handler, inventory, title);
+      this.player = inventory.player;
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_czkdrxgh;<init>(ILnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_fcvwjvlq;Lnet/minecraft/unmapped/C_fwwsyhuv;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;<init>(ILnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/inventory/RecipeInputInventory;Lnet/minecraft/screen/PropertyDelegate;)V}
+    * Mapping not found
     */
-   public CrafterScreen(int syncId, PlayerInventory playerInventory, RecipeInputInventory inventory, PropertyDelegate propertyDelegate) {
-      super(ScreenHandlerType.CRAFTER_3X3, syncId);
-      this.playerEntity = playerInventory.player;
-      this.propertyDelegate = propertyDelegate;
-      this.inventory = inventory;
-      checkSize(inventory, 9);
-      inventory.onOpen(playerInventory.player);
-      this.m_zhwjtaii(playerInventory);
-      this.addListener(this);
+   @Override
+   protected void init() {
+      super.init();
+      this.titleX = (this.backgroundWidth - this.textRenderer.getWidth(this.title)) / 2;
    }
 
    /**
-    * @mapping {@literal hashed m_zhwjtaii Lnet/minecraft/unmapped/C_czkdrxgh;m_zhwjtaii(Lnet/minecraft/unmapped/C_sxzqocrm;)V}
-    * @mapping {@literal named m_zhwjtaii Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;m_zhwjtaii(Lnet/minecraft/entity/player/PlayerInventory;)V}
+    * Mapping not found
     */
-   private void m_zhwjtaii(PlayerInventory playerInventory) {
-      for (int i = 0; i < 3; i++) {
-         for (int j = 0; j < 3; j++) {
-            int k = j + i * 3;
-            this.addSlot(new C_aklocaaw(this.inventory, k, 26 + j * 18, 17 + i * 18, this));
-         }
+   @Override
+   protected void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType) {
+      if (slot instanceof CrafterSlot && !slot.hasStack() && !this.player.isSpectator()) {
+         switch (actionType) {
+            case PICKUP:
+               if (this.handler.isSlotDisabled(slotId)) {
+                  this.enableSlot(slotId);
+               } else if (this.handler.getCursorStack().isEmpty()) {
+                  this.disableSlot(slotId);
       }
-
-      for (int l = 0; l < 3; l++) {
-         for (int m = 0; m < 9; m++) {
-            this.addSlot(new Slot(playerInventory, m + l * 9 + 9, 8 + m * 18, 84 + l * 18));
+               break;
+            case SWAP:
+               ItemStack lv = this.player.getInventory().getStack(button);
+               if (this.handler.isSlotDisabled(slotId) && !lv.isEmpty()) {
+                  this.enableSlot(slotId);
          }
       }
-
-      for (int n = 0; n < 9; n++) {
-         this.addSlot(new Slot(playerInventory, n, 8 + n * 18, 142));
       }
 
-      this.addSlot(new C_iwgoxhvo(this.craftingResultInventory, 0, 134, 35));
-      this.addProperties(this.propertyDelegate);
-      this.update();
+      super.onMouseClick(slot, slotId, button, actionType);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bofodtgw Lnet/minecraft/unmapped/C_ffdwiayx;m_bofodtgw(I)V}
+    * @mapping {@literal named enableSlot Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;enableSlot(I)V}
     */
-   public void m_swoiymft(int i, boolean bl) {
-      C_aklocaaw lv = (C_aklocaaw)this.getSlot(i);
-      this.propertyDelegate.set(lv.id, bl ? 0 : 1);
-      this.sendContentUpdates();
+   private void enableSlot(int slot) {
+      this.setSlotEnabled(slot, true);
    }
 
    /**
-    * @mapping {@literal hashed m_eqfrxzzc Lnet/minecraft/unmapped/C_czkdrxgh;m_eqfrxzzc(I)Z}
-    * @mapping {@literal named m_eqfrxzzc Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;m_eqfrxzzc(I)Z}
+    * @mapping {@literal hashed m_csyonubj Lnet/minecraft/unmapped/C_ffdwiayx;m_csyonubj(I)V}
+    * @mapping {@literal named disableSlot Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;disableSlot(I)V}
     */
-   public boolean m_eqfrxzzc(int index) {
-      return index > -1 && index < 9 ? this.propertyDelegate.get(index) == 1 : false;
+   private void disableSlot(int slot) {
+      this.setSlotEnabled(slot, false);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wsyqlhaf Lnet/minecraft/unmapped/C_ffdwiayx;m_wsyqlhaf(IZ)V}
+    * @mapping {@literal named setSlotEnabled Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;setSlotEnabled(IZ)V}
     */
-   public boolean m_jwwklrgf() {
-      return this.propertyDelegate.get(9) == 1;
+   private void setSlotEnabled(int slot, boolean enabled) {
+      this.handler.setSlotEnabled(slot, enabled);
+      super.onSlotChangedState(slot, this.handler.syncId, enabled);
+      float f = enabled ? 1.0F : 0.75F;
+      this.player.playSound(SoundEvents.UI_BUTTON_CLICK.value(), 0.4F, f);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public ItemStack quickTransfer(PlayerEntity player, int fromIndex) {
-      ItemStack lv = ItemStack.EMPTY;
-      Slot lv2 = this.slots.get(fromIndex);
-      if (lv2 != null && lv2.hasStack()) {
-         ItemStack lv3 = lv2.getStack();
-         lv = lv3.copy();
-         if (fromIndex < 9) {
-            if (!this.insertItem(lv3, 9, 45, true)) {
-               return ItemStack.EMPTY;
-            }
-         } else if (!this.insertItem(lv3, 0, 9, false)) {
-            return ItemStack.EMPTY;
-         }
-
-         if (lv3.isEmpty()) {
-            lv2.setStack(ItemStack.EMPTY);
-         } else {
-            lv2.markDirty();
+   public void drawSlot(GuiGraphics graphics, Slot slot) {
+      if (slot instanceof CrafterSlot lv && this.handler.isSlotDisabled(slot.id)) {
+         this.drawDisabledSlot(graphics, lv);
+         return;
          }
 
-         if (lv3.getCount() == lv.getCount()) {
-            return ItemStack.EMPTY;
-         }
-
-         lv2.onTakeItem(player, lv3);
-      }
-
-      return lv;
+      super.drawSlot(graphics, slot);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_saucrxvx Lnet/minecraft/unmapped/C_ffdwiayx;m_saucrxvx(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_aklocaaw;)V}
+    * @mapping {@literal named drawDisabledSlot Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;drawDisabledSlot(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/screen/slot/CrafterSlot;)V}
     */
-   @Override
-   public boolean canUse(PlayerEntity player) {
-      return this.inventory.canPlayerUse(player);
+   private void drawDisabledSlot(GuiGraphics graphics, CrafterSlot slot) {
+      graphics.drawGuiTexture(DISABLED_SLOT_TEXTURE, slot.x - 1, slot.y - 1, 18, 18);
    }
 
    /**
-    * @mapping {@literal hashed m_jbxaewfz Lnet/minecraft/unmapped/C_czkdrxgh;m_jbxaewfz()V}
-    * @mapping {@literal named update Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;update()V}
+    * Mapping not found
     */
-   private void update() {
-      if (this.playerEntity instanceof ServerPlayerEntity lv) {
-         World lv2 = lv.getWorld();
-         ItemStack lv3 = (ItemStack)CrafterBlock.getCraftingRecipe(lv2, this.inventory)
-            .map(arg2 -> arg2.craft(this.inventory, lv2.getRegistryManager()))
-            .orElse(ItemStack.EMPTY);
-         this.craftingResultInventory.setStack(0, lv3);
+   @Override
+   public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+      super.render(graphics, mouseX, mouseY, delta);
+      this.drawArrowTexture(graphics);
+      this.drawMouseoverTooltip(graphics, mouseX, mouseY);
+      if (this.focusedSlot instanceof CrafterSlot
+         && !this.handler.isSlotDisabled(this.focusedSlot.id)
+         && this.handler.getCursorStack().isEmpty()
+         && !this.focusedSlot.hasStack()
+         && !this.player.isSpectator()) {
+         graphics.drawTooltip(this.textRenderer, TOGGLEABLE_SLOT_TOOLTIP, mouseX, mouseY);
       }
    }
 
    /**
-    * @mapping {@literal hashed m_xsoclhnb Lnet/minecraft/unmapped/C_czkdrxgh;m_xsoclhnb()Lnet/minecraft/unmapped/C_pjtstjoq;}
-    * @mapping {@literal named getInventory Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;getInventory()Lnet/minecraft/inventory/Inventory;}
-    */
-   public Inventory getInventory() {
-      return this.inventory;
+    * @mapping {@literal hashed m_xbaooyab Lnet/minecraft/unmapped/C_ffdwiayx;m_xbaooyab(Lnet/minecraft/unmapped/C_sedilmty;)V}
+    * @mapping {@literal named drawArrowTexture Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;drawArrowTexture(Lnet/minecraft/client/gui/GuiGraphics;)V}
+    */
+   private void drawArrowTexture(GuiGraphics graphics) {
+      int i = this.width / 2 + 9;
+      int j = this.height / 2 - 48;
+      Identifier lv;
+      if (this.handler.isPowered()) {
+         lv = POWERED_ARROW_TEXTURE;
+      } else {
+         lv = UNPOWERED_ARROW_TEXTURE;
    }
 
-   /**
-    * Mapping not found
-    */
-   @Override
-   public void onSlotUpdate(ScreenHandler handler, int slotId, ItemStack stack) {
-      this.update();
+      graphics.drawGuiTexture(lv, i, j, 16, 16);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void onPropertyUpdate(ScreenHandler handler, int property, int value) {
+   protected void drawBackground(GuiGraphics graphics, float delta, int mouseX, int mouseY) {
+      int k = (this.width - this.backgroundWidth) / 2;
+      int l = (this.height - this.backgroundHeight) / 2;
+      graphics.drawTexture(TEXTURE, k, l, 0, 0, this.backgroundWidth, this.backgroundHeight);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreens.java namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreens.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreens.java	2024-02-06 22:42:24.516751847 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreens.java	2024-02-06 22:41:15.076688517 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_ffdwiayx;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -98,7 +97,7 @@
       register(ScreenHandlerType.GENERIC_9X5, GenericContainerScreen::new);
       register(ScreenHandlerType.GENERIC_9X6, GenericContainerScreen::new);
       register(ScreenHandlerType.GENERIC_3X3, Generic3x3ContainerScreen::new);
-      register(ScreenHandlerType.CRAFTER_3X3, C_ffdwiayx::new);
+      register(ScreenHandlerType.CRAFTER_3X3, CrafterScreen::new);
       register(ScreenHandlerType.ANVIL, AnvilScreen::new);
       register(ScreenHandlerType.BEACON, BeaconScreen::new);
       register(ScreenHandlerType.BLAST_FURNACE, BlastFurnaceScreen::new);
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-02-06 22:42:24.400751739 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-02-06 22:41:14.920688354 +0000
@@ -191,11 +191,11 @@
       matrices.translate(0.5, 0.0, 0.5);
       matrices.rotate(Axis.Y_POSITIVE.rotationDegrees(180.0F - lv.asRotation()));
       matrices.translate(-0.5, 0.0, -0.5);
-      DecoratedPotBlockEntity.C_qjewosgd lv2 = arg.f_uumxnicq;
+      DecoratedPotBlockEntity.WobbleType lv2 = arg.lastWobbleType;
       if (lv2 != null && arg.getWorld() != null) {
-         float g = ((float)(arg.getWorld().getTime() - arg.lastWobbleTime) + f) / (float)lv2.f_dwazkvpc;
+         float g = ((float)(arg.getWorld().getTime() - arg.lastWobbleTime) + f) / (float)lv2.duration;
          if (g >= 0.0F && g <= 1.0F) {
-            if (lv2 == DecoratedPotBlockEntity.C_qjewosgd.POSITIVE) {
+            if (lv2 == DecoratedPotBlockEntity.WobbleType.POSITIVE) {
                float h = 0.015625F;
                float k = g * (float) (Math.PI * 2);
                float l = -1.5F * (MathHelper.cos(k) + 0.5F) * MathHelper.sin(k / 2.0F);
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java	2024-02-06 22:42:24.328751671 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java	2024-02-06 22:41:14.828688257 +0000
@@ -42,24 +42,24 @@
          MobSpawnerLogic lv2 = arg.getLogic();
          Entity lv3 = lv2.getRenderedEntity(lv, arg.getPos());
          if (lv3 != null) {
-            m_faiduebl(f, matrices, vertexConsumers, i, lv3, this.entityRendererDispatcher, lv2.getPrevSpin(), lv2.getSpin());
+            renderSpinningEntity(f, matrices, vertexConsumers, i, lv3, this.entityRendererDispatcher, lv2.getPrevSpin(), lv2.getSpin());
          }
       }
    }
 
    /**
     * @mapping {@literal hashed m_faiduebl Lnet/minecraft/unmapped/C_iglgryfd;m_faiduebl(FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_gmkqxljo;DD)V}
-    * @mapping {@literal named m_faiduebl Lnet/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer;m_faiduebl(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/Entity;Lnet/minecraft/client/render/entity/EntityRenderDispatcher;DD)V}
+    * @mapping {@literal named renderSpinningEntity Lnet/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer;renderSpinningEntity(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/Entity;Lnet/minecraft/client/render/entity/EntityRenderDispatcher;DD)V}
     */
-   public static void m_faiduebl(
+   public static void renderSpinningEntity(
       float delta,
       MatrixStack matrices,
       VertexConsumerProvider vertexConsumers,
       int light,
       Entity entity,
       EntityRenderDispatcher renderDispatcher,
-      double start,
-      double end
+      double prevRotation,
+      double rotation
    ) {
       matrices.push();
       matrices.translate(0.5F, 0.0F, 0.5F);
@@ -70,7 +70,7 @@
       }
 
       matrices.translate(0.0F, 0.4F, 0.0F);
-      matrices.rotate(Axis.Y_POSITIVE.rotationDegrees((float)MathHelper.lerp((double)delta, start, end) * 10.0F));
+      matrices.rotate(Axis.Y_POSITIVE.rotationDegrees((float)MathHelper.lerp((double)delta, prevRotation, rotation) * 10.0F));
       matrices.translate(0.0F, -0.2F, 0.0F);
       matrices.rotate(Axis.X_POSITIVE.rotationDegrees(-30.0F));
       matrices.scale(g, g, g);
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java	2024-02-06 22:42:24.376751717 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java	2024-02-06 22:41:14.892688324 +0000
@@ -2,13 +2,13 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.TrialSpawnerData;
 import net.minecraft.block.entity.TrialSpawnerBlockEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kxkfzuix;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 
 /**
@@ -38,11 +38,13 @@
    public void render(TrialSpawnerBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
       World lv = arg.getWorld();
       if (lv != null) {
-         C_jelkcvqk lv2 = arg.m_wvhkrgdu();
-         C_kxkfzuix lv3 = lv2.m_uohhenov();
-         Entity lv4 = lv3.m_mnonaikc(lv2, lv, lv2.m_gtgamtxz());
+         TrialSpawnerLogic lv2 = arg.getSpawnerLogic();
+         TrialSpawnerData lv3 = lv2.getData();
+         Entity lv4 = lv3.getOrCreateDisplayEntity(lv2, lv, lv2.getState());
          if (lv4 != null) {
-            MobSpawnerBlockEntityRenderer.m_faiduebl(f, matrices, vertexConsumers, i, lv4, this.dispatcher, lv3.m_rvfytrpa(), lv3.m_yjdsgxat());
+            MobSpawnerBlockEntityRenderer.renderSpinningEntity(
+               f, matrices, vertexConsumers, i, lv4, this.dispatcher, lv3.getLastDisplayEntityRotation(), lv3.getDisplayEntityRotation()
+            );
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java namedSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java	2024-02-06 22:42:24.288751634 +0000
+++ namedSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java	2024-02-06 22:41:14.772688198 +0000
@@ -165,7 +165,7 @@
          Block lv2 = ((BlockItem)lv).getBlock();
          if (lv2 instanceof AbstractSkullBlock lv3) {
             NbtCompound lv4 = stack.getNbt();
-            GameProfile gameProfile = lv4 != null ? SkullBlockEntity.m_rrmjdeiy(lv4) : null;
+            GameProfile gameProfile = lv4 != null ? SkullBlockEntity.getProfile(lv4) : null;
             AbstractSkullBlockEntityModel lv5 = (AbstractSkullBlockEntityModel)this.skullModels.get(lv3.getSkullType());
             RenderLayer lv6 = SkullBlockEntityRenderer.getRenderLayer(lv3.getSkullType(), gameProfile);
             SkullBlockEntityRenderer.renderSkull(null, 180.0F, 0.0F, matrices, vertexConsumers, light, lv5, lv6);
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-02-06 22:42:24.288751634 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-02-06 22:41:14.776688202 +0000
@@ -94,7 +94,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_jelkcvqk;
 import net.minecraft.unmapped.C_jnliocmw;
 import net.minecraft.unmapped.C_sjynkhfr;
 import net.minecraft.util.Identifier;
@@ -123,6 +122,7 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.LightType;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
 import net.minecraft.world.WorldView;
@@ -3628,22 +3628,22 @@
             ParticleUtil.spawnParticle(this.world, pos, ParticleTypes.EGG_CRACK, UniformIntProvider.create(3, 6));
             break;
          case 3011:
-            C_jelkcvqk.m_bfccdstr(this.world, pos, lv);
+            TrialSpawnerLogic.addSpawnParticles(this.world, pos, lv);
             break;
          case 3012:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_MOB, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_bfccdstr(this.world, pos, lv);
+            TrialSpawnerLogic.addSpawnParticles(this.world, pos, lv);
             break;
          case 3013:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_DETECT_PLAYER, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_wubotvnx(this.world, pos, lv, data);
+            TrialSpawnerLogic.addDetectionParticles(this.world, pos, lv, data);
             break;
          case 3014:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_EJECT_ITEM, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_dalhosuv(this.world, pos, lv);
+            TrialSpawnerLogic.addEjectItemParticles(this.world, pos, lv);
             break;
          case 3015:
             if (this.world.getBlockEntity(pos) instanceof VaultBlockEntity lv9) {
@@ -3656,7 +3656,7 @@
             this.world.playSound(pos, SoundEvents.BLOCK_VAULT_DEACTIVATE, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
             break;
          case 3017:
-            C_jelkcvqk.m_dalhosuv(this.world, pos, lv);
+            TrialSpawnerLogic.addEjectItemParticles(this.world, pos, lv);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/passive/HorseBaseEntity.java namedSrc/net/minecraft/entity/passive/HorseBaseEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/HorseBaseEntity.java	2024-02-06 22:42:24.256751604 +0000
+++ namedSrc/net/minecraft/entity/passive/HorseBaseEntity.java	2024-02-06 22:41:14.736688160 +0000
@@ -43,8 +43,8 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.inventory.InventoryChangedListener;
-import net.minecraft.inventory.JukeboxInventory;
 import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.inventory.SingleStackInventory;
 import net.minecraft.inventory.StackReference;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -297,7 +297,7 @@
    /**
     * Mapping not found
     */
-   private final Inventory f_alpcqiot = new JukeboxInventory() {
+   private final Inventory f_alpcqiot = new SingleStackInventory() {
       /**
        * Mapping not found
        */
diff -bur namedTargetSrc/net/minecraft/entity/player/PlayerEntity.java namedSrc/net/minecraft/entity/player/PlayerEntity.java
--- namedTargetSrc/net/minecraft/entity/player/PlayerEntity.java	2024-02-06 22:42:24.476751810 +0000
+++ namedSrc/net/minecraft/entity/player/PlayerEntity.java	2024-02-06 22:41:15.008688446 +0000
@@ -2983,10 +2983,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kuclbyvl Lnet/minecraft/unmapped/C_jzrpycqo;m_kuclbyvl(Ljava/lang/String;)Z}
+    * @mapping {@literal named isValidUsername Lnet/minecraft/entity/player/PlayerEntity;isValidUsername(Ljava/lang/String;)Z}
     */
-   public static boolean m_kuclbyvl(String string) {
-      return string.length() > 16 ? false : string.chars().filter(i -> i <= 32 || i >= 127).findAny().isEmpty();
+   public static boolean isValidUsername(String username) {
+      return username.length() > 16 ? false : username.chars().filter(c -> c <= 32 || c >= 127).findAny().isEmpty();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/inventory/Inventory.java namedSrc/net/minecraft/inventory/Inventory.java
--- namedTargetSrc/net/minecraft/inventory/Inventory.java	2024-02-06 22:42:24.316751661 +0000
+++ namedSrc/net/minecraft/inventory/Inventory.java	2024-02-06 22:41:14.816688244 +0000
@@ -181,21 +181,21 @@
     * @mapping {@literal hashed m_zfgmlilu Lnet/minecraft/unmapped/C_pjtstjoq;m_zfgmlilu(Lnet/minecraft/unmapped/C_kvegafmh;Lnet/minecraft/unmapped/C_jzrpycqo;)Z}
     * @mapping {@literal named canPlayerUse Lnet/minecraft/inventory/Inventory;canPlayerUse(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/player/PlayerEntity;)Z}
     */
-   static boolean canPlayerUse(BlockEntity blockEntity, PlayerEntity entity) {
-      return canPlayerUse(blockEntity, entity, 4.0F);
+   static boolean canPlayerUse(BlockEntity blockEntity, PlayerEntity player) {
+      return canPlayerUse(blockEntity, player, 4.0F);
    }
 
    /**
     * @mapping {@literal hashed m_crvopqlx Lnet/minecraft/unmapped/C_pjtstjoq;m_crvopqlx(Lnet/minecraft/unmapped/C_kvegafmh;Lnet/minecraft/unmapped/C_jzrpycqo;F)Z}
     * @mapping {@literal named canPlayerUse Lnet/minecraft/inventory/Inventory;canPlayerUse(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/player/PlayerEntity;F)Z}
     */
-   static boolean canPlayerUse(BlockEntity entity, PlayerEntity player, float additionalRange) {
-      World lv = entity.getWorld();
-      BlockPos lv2 = entity.getPos();
+   static boolean canPlayerUse(BlockEntity blockEntity, PlayerEntity player, float range) {
+      World lv = blockEntity.getWorld();
+      BlockPos lv2 = blockEntity.getPos();
       if (lv == null) {
          return false;
       } else {
-         return lv.getBlockEntity(lv2) != entity ? false : player.m_tblbycwa(lv2, (double)additionalRange);
+         return lv.getBlockEntity(lv2) != blockEntity ? false : player.m_tblbycwa(lv2, (double)range);
       }
    }
 }
Only in namedTargetSrc/net/minecraft/inventory: JukeboxInventory.java
Only in namedSrc/net/minecraft/inventory: SingleStackInventory.java
diff -bur namedTargetSrc/net/minecraft/item/SkullItem.java namedSrc/net/minecraft/item/SkullItem.java
--- namedTargetSrc/net/minecraft/item/SkullItem.java	2024-02-06 22:42:24.412751750 +0000
+++ namedSrc/net/minecraft/item/SkullItem.java	2024-02-06 22:41:14.932688366 +0000
@@ -57,6 +57,6 @@
    @Override
    public void postProcessNbt(NbtCompound nbt) {
       super.postProcessNbt(nbt);
-      SkullBlockEntity.m_btgpxhvt(nbt);
+      SkullBlockEntity.resolveSkullOwner(nbt);
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/SpawnEggItem.java namedSrc/net/minecraft/item/SpawnEggItem.java
--- namedTargetSrc/net/minecraft/item/SpawnEggItem.java	2024-02-06 22:42:24.352751694 +0000
+++ namedSrc/net/minecraft/item/SpawnEggItem.java	2024-02-06 22:41:14.868688299 +0000
@@ -8,6 +8,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
+import net.minecraft.block.Spawner;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
@@ -19,7 +20,6 @@
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -84,9 +84,9 @@
          BlockPos lv3 = context.getBlockPos();
          Direction lv4 = context.getSide();
          BlockState lv5 = lv.getBlockState(lv3);
-         if (lv.getBlockEntity(lv3) instanceof C_xheeywhc lv6) {
+         if (lv.getBlockEntity(lv3) instanceof Spawner lv6) {
             EntityType<?> lv7 = this.getEntityType(lv2.getNbt());
-            lv6.m_aohplshh(lv7, lv.getRandom());
+            lv6.setEntityType(lv7, lv.getRandom());
             lv.updateListeners(lv3, lv5, lv5, Block.NOTIFY_ALL);
             lv.emitGameEvent(context.getPlayer(), GameEvent.BLOCK_CHANGE, lv3);
             lv2.decrement(1);
Only in namedSrc/net/minecraft/screen: CrafterScreenHandler.java
diff -bur namedTargetSrc/net/minecraft/screen/Generic3x3ContainerScreenHandler.java namedSrc/net/minecraft/screen/Generic3x3ContainerScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/Generic3x3ContainerScreenHandler.java	2024-02-06 22:42:24.472751806 +0000
+++ namedSrc/net/minecraft/screen/Generic3x3ContainerScreenHandler.java	2024-02-06 22:41:15.004688442 +0000
@@ -14,9 +14,9 @@
 public class Generic3x3ContainerScreenHandler extends ScreenHandler {
    /**
     * @mapping {@literal hashed f_gykgycuv Lnet/minecraft/unmapped/C_lwaresgj;f_gykgycuv:I}
-    * @mapping {@literal named SLOTS_COUNT Lnet/minecraft/screen/Generic3x3ContainerScreenHandler;SLOTS_COUNT:I}
+    * @mapping {@literal named SLOT_COUNT Lnet/minecraft/screen/Generic3x3ContainerScreenHandler;SLOT_COUNT:I}
     */
-   private static final int SLOTS_COUNT = 9;
+   private static final int SLOT_COUNT = 9;
    /**
     * @mapping {@literal hashed f_vwhpevdp Lnet/minecraft/unmapped/C_lwaresgj;f_vwhpevdp:I}
     * @mapping {@literal named INVENTORY_SLOTS_START Lnet/minecraft/screen/Generic3x3ContainerScreenHandler;INVENTORY_SLOTS_START:I}
diff -bur namedTargetSrc/net/minecraft/screen/ScreenHandlerType.java namedSrc/net/minecraft/screen/ScreenHandlerType.java
--- namedTargetSrc/net/minecraft/screen/ScreenHandlerType.java	2024-02-06 22:42:24.496751828 +0000
+++ namedSrc/net/minecraft/screen/ScreenHandlerType.java	2024-02-06 22:41:15.048688488 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.screen;
 
-import net.minecraft.client.gui.screen.ingame.CrafterScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.feature_flags.FeatureFlag;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -53,7 +52,7 @@
     * @mapping {@literal hashed f_fuafmmiw Lnet/minecraft/unmapped/C_nyfkquex;f_fuafmmiw:Lnet/minecraft/unmapped/C_nyfkquex;}
     * @mapping {@literal named CRAFTER_3X3 Lnet/minecraft/screen/ScreenHandlerType;CRAFTER_3X3:Lnet/minecraft/screen/ScreenHandlerType;}
     */
-   public static final ScreenHandlerType<CrafterScreen> CRAFTER_3X3 = register("crafter_3x3", CrafterScreen::new);
+   public static final ScreenHandlerType<CrafterScreenHandler> CRAFTER_3X3 = register("crafter_3x3", CrafterScreenHandler::new);
    /**
     * @mapping {@literal hashed f_muephvhf Lnet/minecraft/unmapped/C_nyfkquex;f_muephvhf:Lnet/minecraft/unmapped/C_nyfkquex;}
     * @mapping {@literal named ANVIL Lnet/minecraft/screen/ScreenHandlerType;ANVIL:Lnet/minecraft/screen/ScreenHandlerType;}
Only in namedSrc/net/minecraft/screen/slot: CrafterOutputSlot.java
Only in namedSrc/net/minecraft/screen/slot: CrafterSlot.java
diff -bur namedTargetSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java namedSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java	2024-02-06 22:42:24.392751732 +0000
+++ namedSrc/net/minecraft/server/network/ServerLoginNetworkHandler.java	2024-02-06 22:41:14.912688345 +0000
@@ -209,7 +209,7 @@
    @Override
    public void onHello(LoginHelloC2SPacket packet) {
       Validate.validState(this.state == ServerLoginNetworkHandler.State.HELLO, "Unexpected hello packet");
-      Validate.validState(PlayerEntity.m_kuclbyvl(packet.name()), "Invalid characters in username");
+      Validate.validState(PlayerEntity.isValidUsername(packet.name()), "Invalid characters in username");
       this.f_aejkpgmx = packet.name();
       GameProfile gameProfile = this.server.getHostProfile();
       if (gameProfile != null && this.f_aejkpgmx.equalsIgnoreCase(gameProfile.getName())) {
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-02-06 22:42:24.376751717 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2024-02-06 22:41:14.892688324 +0000
@@ -39,7 +39,6 @@
 import net.minecraft.block.entity.JigsawBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.StructureBlockBlockEntity;
-import net.minecraft.client.gui.screen.ingame.CrafterScreen;
 import net.minecraft.client.option.ChatVisibility;
 import net.minecraft.command.SignedCommand;
 import net.minecraft.entity.Entity;
@@ -150,6 +149,7 @@
 import net.minecraft.screen.AbstractRecipeScreenHandler;
 import net.minecraft.screen.AnvilScreenHandler;
 import net.minecraft.screen.BeaconScreenHandler;
+import net.minecraft.screen.CrafterScreenHandler;
 import net.minecraft.screen.MerchantScreenHandler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
@@ -1077,7 +1077,7 @@
    public void onSlotChangedState(SlotChangedStateC2SPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.player.getServerWorld());
       if (!this.player.isSpectator() && packet.getContainerId() == this.player.currentScreenHandler.syncId) {
-         if (this.player.currentScreenHandler instanceof CrafterScreen lv && lv.getInventory() instanceof CrafterBlockEntity lv2) {
+         if (this.player.currentScreenHandler instanceof CrafterScreenHandler lv && lv.getInventory() instanceof CrafterBlockEntity lv2) {
             lv2.setSlotEnabled(packet.getSlotId(), packet.getNewState());
          }
       }
diff -bur namedTargetSrc/net/minecraft/structure/MineshaftGenerator.java namedSrc/net/minecraft/structure/MineshaftGenerator.java
--- namedTargetSrc/net/minecraft/structure/MineshaftGenerator.java	2024-02-06 22:42:24.452751788 +0000
+++ namedSrc/net/minecraft/structure/MineshaftGenerator.java	2024-02-06 22:41:14.976688412 +0000
@@ -498,7 +498,7 @@
                      this.hasSpawner = true;
                      world.setBlockState(lv2, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                      if (world.getBlockEntity(lv2) instanceof MobSpawnerBlockEntity lv4) {
-                        lv4.m_aohplshh(EntityType.CAVE_SPIDER, random);
+                        lv4.setEntityType(EntityType.CAVE_SPIDER, random);
                      }
                   }
                }
diff -bur namedTargetSrc/net/minecraft/structure/NetherFortressGenerator.java namedSrc/net/minecraft/structure/NetherFortressGenerator.java
--- namedTargetSrc/net/minecraft/structure/NetherFortressGenerator.java	2024-02-06 22:42:24.512751844 +0000
+++ namedSrc/net/minecraft/structure/NetherFortressGenerator.java	2024-02-06 22:41:15.072688513 +0000
@@ -607,7 +607,7 @@
                this.hasBlazeSpawner = true;
                world.setBlockState(lv3, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                if (world.getBlockEntity(lv3) instanceof MobSpawnerBlockEntity lv5) {
-                  lv5.m_aohplshh(EntityType.BLAZE, random);
+                  lv5.setEntityType(EntityType.BLAZE, random);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/structure/StrongholdGenerator.java namedSrc/net/minecraft/structure/StrongholdGenerator.java
--- namedTargetSrc/net/minecraft/structure/StrongholdGenerator.java	2024-02-06 22:42:24.376751717 +0000
+++ namedSrc/net/minecraft/structure/StrongholdGenerator.java	2024-02-06 22:41:14.892688324 +0000
@@ -1567,7 +1567,7 @@
                this.spawnerPlaced = true;
                world.setBlockState(lv9, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                if (world.getBlockEntity(lv9) instanceof MobSpawnerBlockEntity lv11) {
-                  lv11.m_aohplshh(EntityType.SILVERFISH, random);
+                  lv11.setEntityType(EntityType.SILVERFISH, random);
                }
             }
          }
Only in namedTargetSrc/net/minecraft/unmapped: C_aklocaaw.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_cudfnjix.java namedSrc/net/minecraft/unmapped/C_cudfnjix.java
--- namedTargetSrc/net/minecraft/unmapped/C_cudfnjix.java	2024-02-06 22:42:24.492751825 +0000
+++ namedSrc/net/minecraft/unmapped/C_cudfnjix.java	2024-02-06 22:41:15.036688475 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.loot.LootTables;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
+import net.minecraft.world.EntityDetector;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_cudfnjix}
@@ -20,8 +21,8 @@
    double deactivationRange,
    ItemStack keyItem,
    Optional<Identifier> overrideLootTableToDisplay,
-   C_kkiexczn playerDetector,
-   C_kkiexczn.C_ztluwxut entitySelector
+   EntityDetector playerDetector,
+   EntityDetector.EntitySelector entitySelector
 ) {
    /**
     * Mapping not found
@@ -59,8 +60,8 @@
          4.5,
          new ItemStack(Items.TRIAL_KEY),
          Optional.empty(),
-         C_kkiexczn.f_yumifdey,
-         C_kkiexczn.C_ztluwxut.f_upomikid
+         EntityDetector.NON_SPECTATING_PLAYERS,
+         EntityDetector.EntitySelector.WORLD_ENTITY_SELECTOR
       );
    }
 
@@ -75,7 +76,7 @@
    /**
     * Mapping not found
     */
-   public C_kkiexczn m_gwbttbvm() {
+   public EntityDetector m_gwbttbvm() {
       return this.playerDetector;
    }
 
diff -bur namedTargetSrc/net/minecraft/unmapped/C_czyoqmgb.java namedSrc/net/minecraft/unmapped/C_czyoqmgb.java
--- namedTargetSrc/net/minecraft/unmapped/C_czyoqmgb.java	2024-02-06 22:42:24.348751690 +0000
+++ namedSrc/net/minecraft/unmapped/C_czyoqmgb.java	2024-02-06 22:41:14.864688295 +0000
@@ -120,9 +120,9 @@
     * @mapping {@literal hashed m_uflgzskl Lnet/minecraft/unmapped/C_czyoqmgb;m_uflgzskl(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_cudfnjix;D)V}
     * @mapping {@literal named m_uflgzskl Lnet/minecraft/unmapped/C_czyoqmgb;m_uflgzskl(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_cudfnjix;D)V}
     */
-   void m_uflgzskl(ServerWorld world, BlockPos pos, C_nsbycoiv arg3, C_cudfnjix arg4, double d) {
+   void m_uflgzskl(ServerWorld world, BlockPos pos, C_nsbycoiv arg3, C_cudfnjix arg4, double range) {
       Set<UUID> set = (Set<UUID>)arg4.m_gwbttbvm()
-         .detect(world, arg4.entitySelector(), pos, d)
+         .detect(world, arg4.entitySelector(), pos, range)
          .stream()
          .filter(uuid -> !arg3.m_jkvzabvv().contains(uuid))
          .collect(Collectors.toSet());
Only in namedTargetSrc/net/minecraft/unmapped: C_ffdwiayx.java
Only in namedTargetSrc/net/minecraft/unmapped: C_iwgoxhvo.java
Only in namedTargetSrc/net/minecraft/unmapped: C_jelkcvqk.java
Only in namedTargetSrc/net/minecraft/unmapped: C_kkiexczn.java
Only in namedTargetSrc/net/minecraft/unmapped: C_kxkfzuix.java
Only in namedTargetSrc/net/minecraft/unmapped: C_pocjjnjk.java
Only in namedTargetSrc/net/minecraft/unmapped: C_pyxrohya.java
Only in namedTargetSrc/net/minecraft/unmapped: C_qiypfnai.java
Only in namedTargetSrc/net/minecraft/unmapped: C_xheeywhc.java
diff -bur namedTargetSrc/net/minecraft/util/UserCache.java namedSrc/net/minecraft/util/UserCache.java
--- namedTargetSrc/net/minecraft/util/UserCache.java	2024-02-06 22:42:24.508751839 +0000
+++ namedSrc/net/minecraft/util/UserCache.java	2024-02-06 22:41:15.064688505 +0000
@@ -135,7 +135,7 @@
     * @mapping {@literal named findProfileByName Lnet/minecraft/util/UserCache;findProfileByName(Lcom/mojang/authlib/GameProfileRepository;Ljava/lang/String;)Ljava/util/Optional;}
     */
    private static Optional<GameProfile> findProfileByName(GameProfileRepository repository, String name) {
-      if (!PlayerEntity.m_kuclbyvl(name)) {
+      if (!PlayerEntity.isValidUsername(name)) {
          return getOfflineProfile(name);
       } else {
          final AtomicReference<GameProfile> atomicReference = new AtomicReference();
Only in namedSrc/net/minecraft/world: EntityDetector.java
diff -bur namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java
--- namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2024-02-06 22:42:24.508751839 +0000
+++ namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2024-02-06 22:41:15.068688509 +0000
@@ -138,7 +138,7 @@
 
          this.setBlockStateIf(lv3, lv, Blocks.SPAWNER.getDefaultState(), predicate);
          if (lv3.getBlockEntity(lv) instanceof MobSpawnerBlockEntity lv10) {
-            lv10.m_aohplshh(this.getMobSpawnerEntity(lv2), lv2);
+            lv10.setEntityType(this.getMobSpawnerEntity(lv2), lv2);
          } else {
             LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", lv.getX(), lv.getY(), lv.getZ());
          }
diff -bur namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java namedSrc/net/minecraft/world/MobSpawnerEntry.java
--- namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java	2024-02-06 22:42:24.500751832 +0000
+++ namedSrc/net/minecraft/world/MobSpawnerEntry.java	2024-02-06 22:41:15.052688492 +0000
@@ -122,9 +122,9 @@
 
       /**
        * @mapping {@literal hashed m_oafnehiw Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;m_oafnehiw(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z}
-       * @mapping {@literal named m_oafnehiw Lnet/minecraft/world/MobSpawnerEntry$CustomSpawnRules;m_oafnehiw(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;)Z}
+       * @mapping {@literal named canSpawn Lnet/minecraft/world/MobSpawnerEntry$CustomSpawnRules;canSpawn(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;)Z}
        */
-      public boolean m_oafnehiw(BlockPos pos, ServerWorld world) {
+      public boolean canSpawn(BlockPos pos, ServerWorld world) {
          return this.blockLightLimit.isWithinRange(world.getLightLevel(LightType.BLOCK, pos))
             && this.skyLightLimit.isWithinRange(world.getLightLevel(LightType.SKY, pos));
       }
diff -bur namedTargetSrc/net/minecraft/world/MobSpawnerLogic.java namedSrc/net/minecraft/world/MobSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/MobSpawnerLogic.java	2024-02-06 22:42:24.424751761 +0000
+++ namedSrc/net/minecraft/world/MobSpawnerLogic.java	2024-02-06 22:41:14.948688383 +0000
@@ -186,7 +186,7 @@
                      }
 
                      MobSpawnerEntry.CustomSpawnRules lv6 = (MobSpawnerEntry.CustomSpawnRules)lv2.getCustomSpawnRules().get();
-                     if (!lv6.m_oafnehiw(lv5, world)) {
+                     if (!lv6.canSpawn(lv5, world)) {
                         continue;
                      }
                   } else if (!SpawnRestriction.canSpawn((EntityType)optional.get(), world, SpawnReason.SPAWNER, lv5, world.getRandom())) {
Only in namedSrc/net/minecraft/world: TrialSpawnerLogic.java

Please sign in to comment.