diff --git a/mappings/com/mojang/blaze3d/platform/GLX.mapping b/mappings/com/mojang/blaze3d/platform/GLX.mapping index c2619583b9..6dcdc955e4 100644 --- a/mappings/com/mojang/blaze3d/platform/GLX.mapping +++ b/mappings/com/mojang/blaze3d/platform/GLX.mapping @@ -1,8 +1,5 @@ CLASS com/mojang/blaze3d/platform/GLX CLASS com/mojang/blaze3d/platform/GLX$a FBOMode - FIELD a BASE Lcom/mojang/blaze3d/platform/GLX$a; - FIELD b ARB Lcom/mojang/blaze3d/platform/GLX$a; - FIELD c EXT Lcom/mojang/blaze3d/platform/GLX$a; METHOD glActiveTexture (I)V ARG 0 texture METHOD glAttachShader (II)V diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 240af776f2..0f7b4cb142 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -83,7 +83,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c; FIELD b boundTexture I CLASS com/mojang/blaze3d/platform/GlStateManager$w Viewport - FIELD a INSTANCE Lcom/mojang/blaze3d/platform/GlStateManager$w; FIELD b x I FIELD c y I FIELD d width I diff --git a/mappings/net/minecraft/ChatFormat.mapping b/mappings/net/minecraft/ChatFormat.mapping index 7174e4a432..471e8bdd9a 100644 --- a/mappings/net/minecraft/ChatFormat.mapping +++ b/mappings/net/minecraft/ChatFormat.mapping @@ -3,8 +3,6 @@ CLASS c net/minecraft/ChatFormat FIELD B code Ljava/lang/String; FIELD C id I FIELD D color Ljava/lang/Integer; - FIELD a BLACK Lc; - FIELD v RESET Lc; FIELD x FORMAT_PATTERN Ljava/util/regex/Pattern; FIELD z sectionSignCode C METHOD a bySectionSignCode (C)Lc; diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping index 0f8d55adcf..e6012dc067 100644 --- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping +++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping @@ -1,7 +1,4 @@ CLASS aa net/minecraft/advancement/AdvancementFrame - FIELD a TASK Laa; - FIELD b CHALLENGE Laa; - FIELD c GOAL Laa; FIELD d id Ljava/lang/String; FIELD e texV I FIELD f titleFormat Lc; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index ec1ab43bd7..5a4494840d 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -10,9 +10,6 @@ CLASS bml net/minecraft/block/Block METHOD equals (Ljava/lang/Object;)Z ARG 1 o CLASS bml$b OffsetType - FIELD a NONE Lbml$b; - FIELD b XZ Lbml$b; - FIELD c XYZ Lbml$b; CLASS bml$c Settings FIELD a material Lcld; FIELD b materialColor Lcle; diff --git a/mappings/net/minecraft/block/BlockRenderLayer.mapping b/mappings/net/minecraft/block/BlockRenderLayer.mapping index 4cdcaf6817..97318a1142 100644 --- a/mappings/net/minecraft/block/BlockRenderLayer.mapping +++ b/mappings/net/minecraft/block/BlockRenderLayer.mapping @@ -1,8 +1,5 @@ CLASS bgs net/minecraft/block/BlockRenderLayer - FIELD a SOLID Lbgs; - FIELD b MIPPED_CUTOUT Lbgs; - FIELD c CUTOUT Lbgs; - FIELD d TRANSLUCENT Lbgs; + FIELD b CUTOUT_MIPPED Lbgs; FIELD e name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index e413e1a3ca..e2af44a169 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1,5 +1,4 @@ CLASS bmm net/minecraft/block/Blocks - FIELD a AIR Lbml; METHOD a register (Ljava/lang/String;Lbml;)Lbml; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/block/PressurePlateBlock.mapping b/mappings/net/minecraft/block/PressurePlateBlock.mapping index 7e913299f9..8617c81c3f 100644 --- a/mappings/net/minecraft/block/PressurePlateBlock.mapping +++ b/mappings/net/minecraft/block/PressurePlateBlock.mapping @@ -1,7 +1,5 @@ CLASS bqk net/minecraft/block/PressurePlateBlock - CLASS bqk$a Type - FIELD a WOOD Lbqk$a; - FIELD b STONE Lbqk$a; + CLASS bqk$a ActivationRule FIELD d POWERED Lbwb; FIELD e type Lbqk$a; METHOD (Lbqk$a;Lbml$c;)V diff --git a/mappings/net/minecraft/block/SkullBlock.mapping b/mappings/net/minecraft/block/SkullBlock.mapping index 0bd1315ce7..779044f551 100644 --- a/mappings/net/minecraft/block/SkullBlock.mapping +++ b/mappings/net/minecraft/block/SkullBlock.mapping @@ -1,12 +1,6 @@ CLASS brg net/minecraft/block/SkullBlock CLASS brg$a SkullType CLASS brg$b Type - FIELD a SKELETON Lbrg$b; - FIELD b WITHER_SKELETON Lbrg$b; - FIELD c PLAYER Lbrg$b; - FIELD d ZOMBIE Lbrg$b; - FIELD e CREEPER Lbrg$b; - FIELD f DRAGON Lbrg$b; FIELD a ROTATION Lbwj; FIELD b SHAPE Lcsp; METHOD h (Lbvj;Lbgr;Lev;)Lcsp; diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index 500ea26ddb..6eafca0ce2 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -4,13 +4,13 @@ CLASS btf net/minecraft/block/entity/BannerPattern METHOD a build ()Lii; METHOD a with (Lbtf;Lbax;)Lbtf$a; ARG 1 pattern - FIELD A HALF_VERTICAL_LEFT Lbtf; - FIELD B HALF_HORIZONTAL_TOP Lbtf; - FIELD C HALF_VERTICAL_RIGHT Lbtf; - FIELD D HALF_HORIZONTAL_BOTTOM Lbtf; + FIELD A HALF_VERTICAL Lbtf; + FIELD B HALF_HORIZONTAL Lbtf; + FIELD C HALF_VERTICAL_MIRROR Lbtf; + FIELD D HALF_HORIZONTAL_MIRROR Lbtf; FIELD E BORDER Lbtf; FIELD F CURLY_BORDER Lbtf; - FIELD G GRADIENT_DOWN Lbtf; + FIELD G GRADIENT Lbtf; FIELD H GRADIENT_UP Lbtf; FIELD I BRICKS Lbtf; FIELD J GLOBE Lbtf; @@ -36,19 +36,19 @@ CLASS btf net/minecraft/block/entity/BannerPattern FIELD k STRIPE_MIDDLE Lbtf; FIELD l STRIPE_DOWNRIGHT Lbtf; FIELD m STRIPE_DOWNLEFT Lbtf; - FIELD n SMALL_STRIPES Lbtf; + FIELD n STRIPE_SMALL Lbtf; FIELD o CROSS Lbtf; FIELD p STRAIGHT_CROSS Lbtf; FIELD q TRIANGLE_BOTTOM Lbtf; FIELD r TRIANGLE_TOP Lbtf; FIELD s TRIANGLES_BOTTOM Lbtf; FIELD t TRIANGLES_TOP Lbtf; - FIELD u DIAGONAL_DOWN_LEFT Lbtf; - FIELD v DIAGONAL_UP_RIGHT Lbtf; - FIELD w DIAGONAL_UP_LEFT Lbtf; - FIELD x DIAGONAL_DOWN_RIGHT Lbtf; - FIELD y CIRCLE Lbtf; - FIELD z RHOMBUS Lbtf; + FIELD u DIAGONAL_LEFT Lbtf; + FIELD v DIAGONAL_RIGHT Lbtf; + FIELD w DIAGONAL_LEFT_MIRROR Lbtf; + FIELD x DIAGONAL_RIGHT_MIRROR Lbtf; + FIELD y CIRCLE_MIDDLE Lbtf; + FIELD z RHOMBUS_MIDDLE Lbtf; METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V ARG 3 name METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Lbca;)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index 5b2669ec2e..83fd9ba4f7 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -4,41 +4,9 @@ CLASS btn net/minecraft/block/entity/BlockEntityType METHOD a build (Lcom/mojang/datafixers/types/Type;)Lbtn; METHOD a create (Ljava/util/function/Supplier;)Lbtn$a; ARG 0 supplier - FIELD A SMOKER Lbtn; - FIELD B BLAST_FURNACE Lbtn; - FIELD C LECTERN Lbtn; - FIELD D BELL Lbtn; - FIELD E JIGSAW Lbtn; - FIELD F CAMPFIRE Lbtn; FIELD G LOGGER Lorg/apache/logging/log4j/Logger; FIELD H supplier Ljava/util/function/Supplier; FIELD I type Lcom/mojang/datafixers/types/Type; - FIELD a FURNACE Lbtn; - FIELD b CHEST Lbtn; - FIELD c TRAPPED_CHEST Lbtn; - FIELD d ENDER_CHEST Lbtn; - FIELD e JUKEBOX Lbtn; - FIELD f DISPENSER Lbtn; - FIELD g DROPPER Lbtn; - FIELD h SIGN Lbtn; - FIELD i MOB_SPAWNER Lbtn; - FIELD j PISTON Lbtn; - FIELD k BREWING_STAND Lbtn; - FIELD l ENCHANTING_TABLE Lbtn; - FIELD m END_PORTAL Lbtn; - FIELD n BEACON Lbtn; - FIELD o SKULL Lbtn; - FIELD p DAYLIGHT_DETECTOR Lbtn; - FIELD q HOPPER Lbtn; - FIELD r COMPARATOR Lbtn; - FIELD s BANNER Lbtn; - FIELD t STRUCTURE_BLOCK Lbtn; - FIELD u END_GATEWAY Lbtn; - FIELD v COMMAND_BLOCK Lbtn; - FIELD w SHUlKER_BOX Lbtn; - FIELD x BED Lbtn; - FIELD y CONDUIT Lbtn; - FIELD z BARREL Lbtn; METHOD a instantiate ()Lbtm; METHOD a getId (Lbtn;)Lqs; METHOD a create (Ljava/lang/String;Lbtn$a;)Lbtn; diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 9de27ad861..e86c483a0e 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -1,7 +1,5 @@ CLASS buh net/minecraft/block/entity/ShulkerBoxBlockEntity CLASS buh$a AnimationStage - FIELD a CLOSED Lbuh$a; - FIELD c OPENED Lbuh$a; FIELD a AVAILABLE_SLOTS [I FIELD b inventory Lfj; FIELD c viewerCount I diff --git a/mappings/net/minecraft/block/enums/BlockHalf.mapping b/mappings/net/minecraft/block/enums/BlockHalf.mapping index dc2042cc19..ba8965137c 100644 --- a/mappings/net/minecraft/block/enums/BlockHalf.mapping +++ b/mappings/net/minecraft/block/enums/BlockHalf.mapping @@ -1,4 +1,2 @@ CLASS bwi net/minecraft/block/enums/BlockHalf - FIELD a TOP Lbwi; - FIELD b BOTTOM Lbwi; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/audio/Sound.mapping b/mappings/net/minecraft/client/audio/Sound.mapping index 83274f6f78..6a036ccc0e 100644 --- a/mappings/net/minecraft/client/audio/Sound.mapping +++ b/mappings/net/minecraft/client/audio/Sound.mapping @@ -1,7 +1,6 @@ CLASS dwr net/minecraft/client/audio/Sound CLASS dwr$a RegistrationType - FIELD a FILE Ldwr$a; - FIELD b EVENT Ldwr$a; + FIELD b SOUND_EVENT Ldwr$a; FIELD c name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/client/audio/SoundInstance.mapping b/mappings/net/minecraft/client/audio/SoundInstance.mapping index 21888b9361..2482c5cb1c 100644 --- a/mappings/net/minecraft/client/audio/SoundInstance.mapping +++ b/mappings/net/minecraft/client/audio/SoundInstance.mapping @@ -1,7 +1,5 @@ CLASS dwu net/minecraft/client/audio/SoundInstance CLASS dwu$a AttenuationType - FIELD a NONE Ldwu$a; - FIELD b LINEAR Ldwu$a; METHOD a getId ()Lqs; METHOD a getSoundSet (Ldxu;)Ldxv; ARG 1 soundManager diff --git a/mappings/net/minecraft/client/audio/SoundManager.mapping b/mappings/net/minecraft/client/audio/SoundManager.mapping index f892928efb..bf45c395c5 100644 --- a/mappings/net/minecraft/client/audio/SoundManager.mapping +++ b/mappings/net/minecraft/client/audio/SoundManager.mapping @@ -6,7 +6,7 @@ CLASS dxu net/minecraft/client/audio/SoundManager ARG 1 id ARG 2 entry ARG 3 resourceManager - FIELD a SOUND_MISSING Ldwr; + FIELD a MISSING_SOUND Ldwr; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c GSON Lcom/google/gson/Gson; FIELD d TYPE Ljava/lang/reflect/ParameterizedType; diff --git a/mappings/net/minecraft/client/font/BlankGlyph.mapping b/mappings/net/minecraft/client/font/BlankGlyph.mapping index 63eee34ed9..0375b04bef 100644 --- a/mappings/net/minecraft/client/font/BlankGlyph.mapping +++ b/mappings/net/minecraft/client/font/BlankGlyph.mapping @@ -1,3 +1,2 @@ CLASS cyd net/minecraft/client/font/BlankGlyph - FIELD a INSTANCE Lcyd; FIELD b IMAGE Lctw; diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping index c91da9b59c..795ad21abb 100644 --- a/mappings/net/minecraft/client/font/FontType.mapping +++ b/mappings/net/minecraft/client/font/FontType.mapping @@ -1,7 +1,4 @@ CLASS cyi net/minecraft/client/font/FontType - FIELD a BITMAP Lcyi; - FIELD b TTF Lcyi; - FIELD c LEGACY_UNICODE Lcyi; FIELD d REGISTRY Ljava/util/Map; FIELD e id Ljava/lang/String; FIELD f loaderFactory Ljava/util/function/Function; diff --git a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping index c8ff9c6f22..a0aa25a451 100644 --- a/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping @@ -1,11 +1,5 @@ CLASS cwx net/minecraft/client/gui/widget/LockButtonWidget CLASS cwx$a IconLocation - FIELD a LOCKED Lcwx$a; - FIELD b LOCKED_HOVERED Lcwx$a; - FIELD c LOCKED_DISABLED Lcwx$a; - FIELD d UNLOCKED Lcwx$a; - FIELD e UNLOCKED_HOVERED Lcwx$a; - FIELD f UNLOCKED_DISABLED Lcwx$a; FIELD g u I FIELD h v I METHOD (Ljava/lang/String;III)V diff --git a/mappings/net/minecraft/client/item/TooltipContext.mapping b/mappings/net/minecraft/client/item/TooltipContext.mapping index 6d07ecc4e6..8714faf3c9 100644 --- a/mappings/net/minecraft/client/item/TooltipContext.mapping +++ b/mappings/net/minecraft/client/item/TooltipContext.mapping @@ -1,7 +1,5 @@ CLASS bdi net/minecraft/client/item/TooltipContext CLASS bdi$a Default - FIELD a NORMAL Lbdi$a; - FIELD b ADVANCED Lbdi$a; FIELD c advanced Z METHOD (Ljava/lang/String;IZ)V ARG 3 advanced diff --git a/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping index a487191a2d..d16f030559 100644 --- a/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping @@ -1,11 +1,5 @@ CLASS kq net/minecraft/client/network/packet/BossBarS2CPacket CLASS kq$a Type - FIELD a ADD Lkq$a; - FIELD b REMOVE Lkq$a; - FIELD c UPDATE_PCT Lkq$a; - FIELD d UPDATE_TITLE Lkq$a; - FIELD e UPDATE_STYLE Lkq$a; - FIELD f UPDATE_FLAGS Lkq$a; FIELD a uuid Ljava/util/UUID; FIELD b type Lkq$a; FIELD c name Ljm; diff --git a/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping index e83fe22959..d4874f01d0 100644 --- a/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping @@ -1,8 +1,5 @@ CLASS lz net/minecraft/client/network/packet/CombatEventS2CPacket CLASS lz$a Type - FIELD a BEGIN Llz$a; - FIELD b END Llz$a; - FIELD c DEATH Llz$a; FIELD a type Llz$a; FIELD b entityId I FIELD c attackerEntityId I diff --git a/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping index 69be06201a..6861c7494d 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping @@ -1,10 +1,5 @@ CLASS ma net/minecraft/client/network/packet/PlayerListS2CPacket CLASS ma$a Action - FIELD a ADD Lma$a; - FIELD b UPDATE_GAMEMODE Lma$a; - FIELD c UPDATE_LATENCY Lma$a; - FIELD d UPDATE_DISPLAY_NAME Lma$a; - FIELD e REMOVE Lma$a; CLASS ma$b Entry FIELD b latency I FIELD c gameMode Lbhe; diff --git a/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping index 93625cfb4f..0d88a40be5 100644 --- a/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping @@ -1,10 +1,5 @@ CLASS mc net/minecraft/client/network/packet/PlayerPositionLookS2CPacket CLASS mc$a Flag - FIELD a X Lmc$a; - FIELD b Y Lmc$a; - FIELD c Z Lmc$a; - FIELD d Y_ROT Lmc$a; - FIELD e X_ROT Lmc$a; FIELD f shift I METHOD a getMask ()I METHOD a getFlags (I)Ljava/util/Set; diff --git a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping index c2e98d5283..dc6f67de3e 100644 --- a/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping @@ -1,8 +1,5 @@ CLASS nc net/minecraft/client/network/packet/TitleS2CPacket CLASS nc$a Action - FIELD d DISPLAY Lnc$a; - FIELD e HIDE Lnc$a; - FIELD f RESET Lnc$a; FIELD a action Lnc$a; FIELD b text Ljm; FIELD c fadeInTicks I diff --git a/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping index 215d2f778c..1fa5b4580a 100644 --- a/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping @@ -1,11 +1,5 @@ CLASS mk net/minecraft/client/network/packet/WorldBorderS2CPacket CLASS mk$a Type - FIELD a SET_SIZE Lmk$a; - FIELD b INTERPOLATE_SIZE Lmk$a; - FIELD c SET_CENTER Lmk$a; - FIELD d INITIALIZE Lmk$a; - FIELD e SET_WARNING_TIME Lmk$a; - FIELD f SET_WARNING_BLOCKS Lmk$a; FIELD a type Lmk$a; FIELD b portalTeleportPosLimit I FIELD c centerX D diff --git a/mappings/net/minecraft/client/options/AoOption.mapping b/mappings/net/minecraft/client/options/AoOption.mapping index 0ea882b166..b1000b2507 100644 --- a/mappings/net/minecraft/client/options/AoOption.mapping +++ b/mappings/net/minecraft/client/options/AoOption.mapping @@ -1,4 +1,7 @@ CLASS cuu net/minecraft/client/options/AoOption + FIELD a OFF Lcuu; + FIELD b MIN Lcuu; + FIELD c MAX Lcuu; FIELD d OPTIONS [Lcuu; FIELD e value I FIELD f translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/AttackIndicator.mapping b/mappings/net/minecraft/client/options/AttackIndicator.mapping index 4bc7d95a25..09fc713e23 100644 --- a/mappings/net/minecraft/client/options/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/options/AttackIndicator.mapping @@ -1,4 +1,7 @@ CLASS cuv net/minecraft/client/options/AttackIndicator + FIELD a OFF Lcuv; + FIELD b CROSSHAIR Lcuv; + FIELD c HOTBAR Lcuv; FIELD d VALUES [Lcuv; FIELD e id I FIELD f translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ChatVisibility.mapping b/mappings/net/minecraft/client/options/ChatVisibility.mapping index cc89360cd9..9e4a351874 100644 --- a/mappings/net/minecraft/client/options/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/options/ChatVisibility.mapping @@ -1,6 +1,6 @@ CLASS avv net/minecraft/client/options/ChatVisibility FIELD a FULL Lavv; - FIELD b COMMANDS Lavv; + FIELD b SYSTEM Lavv; FIELD c HIDDEN Lavv; FIELD e id I FIELD f key Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/options/CloudRenderMode.mapping index be7aa44ab1..2e69a11e4a 100644 --- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/options/CloudRenderMode.mapping @@ -1,4 +1,7 @@ CLASS cuz net/minecraft/client/options/CloudRenderMode + FIELD a OFF Lcuz; + FIELD b FAST Lcuz; + FIELD c FANCY Lcuz; FIELD d RENDER_MODES [Lcuz; FIELD e value I FIELD f translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/NarratorOption.mapping b/mappings/net/minecraft/client/options/NarratorOption.mapping index d7111e9573..b6d143922c 100644 --- a/mappings/net/minecraft/client/options/NarratorOption.mapping +++ b/mappings/net/minecraft/client/options/NarratorOption.mapping @@ -1,4 +1,8 @@ CLASS cvk net/minecraft/client/options/NarratorOption + FIELD a OFF Lcvk; + FIELD b ALL Lcvk; + FIELD c CHAT Lcvk; + FIELD d SYSTEM Lcvk; FIELD e VALUES [Lcvk; FIELD f id I FIELD g translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ParticlesOption.mapping b/mappings/net/minecraft/client/options/ParticlesOption.mapping index a5825ec6d2..78b3141d79 100644 --- a/mappings/net/minecraft/client/options/ParticlesOption.mapping +++ b/mappings/net/minecraft/client/options/ParticlesOption.mapping @@ -1,4 +1,7 @@ CLASS cvn net/minecraft/client/options/ParticlesOption + FIELD a ALL Lcvn; + FIELD b DECREASED Lcvn; + FIELD c MINIMAL Lcvn; FIELD d VALUES [Lcvn; FIELD e id I FIELD f translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/ServerEntry.mapping b/mappings/net/minecraft/client/options/ServerEntry.mapping index b31a9b8698..95e9ba4e20 100644 --- a/mappings/net/minecraft/client/options/ServerEntry.mapping +++ b/mappings/net/minecraft/client/options/ServerEntry.mapping @@ -1,8 +1,5 @@ CLASS dho net/minecraft/client/options/ServerEntry CLASS dho$a ResourcePackState - FIELD a ENABLED Ldho$a; - FIELD b DISABLED Ldho$a; - FIELD c PROMPT Ldho$a; FIELD d component Ljm; METHOD a getComponent ()Ljm; FIELD a name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index 20dae4ca53..528b5742a2 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -1,12 +1,8 @@ CLASS cuq net/minecraft/client/render/VertexFormatElement CLASS cuq$a Format - FIELD a FLOAT Lcuq$a; - FIELD b UNSIGNED_BYTE Lcuq$a; - FIELD c BYTE Lcuq$a; - FIELD d UNSIGNED_SHORT Lcuq$a; - FIELD e SHORT Lcuq$a; - FIELD f UNSIGNED_INT Lcuq$a; - FIELD g INT Lcuq$a; + FIELD b UBYTE Lcuq$a; + FIELD d USHORT Lcuq$a; + FIELD f UINT Lcuq$a; FIELD h size I FIELD i name Ljava/lang/String; FIELD j glId I @@ -18,13 +14,8 @@ CLASS cuq net/minecraft/client/render/VertexFormatElement METHOD b getName ()Ljava/lang/String; METHOD c getGlId ()I CLASS cuq$b Type - FIELD a POSITION Lcuq$b; - FIELD b NORMAL Lcuq$b; FIELD c COLOR Lcuq$b; - FIELD d UV Lcuq$b; - FIELD e BONE_MATRIX Lcuq$b; - FIELD f BLEND_WEIGHT Lcuq$b; - FIELD g PADDING Lcuq$b; + FIELD e MATRIX Lcuq$b; FIELD h name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 4bda06a35b..cd3f91e0c7 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -1,11 +1,5 @@ CLASS dle net/minecraft/client/render/block/BlockModelRenderer CLASS dle$a NeighborData - FIELD a DOWN Ldle$a; - FIELD b UP Ldle$a; - FIELD c NORTH Ldle$a; - FIELD d SOUTH Ldle$a; - FIELD e WEST Ldle$a; - FIELD f EAST Ldle$a; FIELD g faces [Lfa; FIELD h nonCubicWeight Z METHOD a getData (Lfa;)Ldle$a; @@ -16,12 +10,6 @@ CLASS dle net/minecraft/client/render/block/BlockModelRenderer METHOD a getBrightness (IIIIFFFF)I METHOD a apply (Lbgp;Lbvj;Lev;Lfa;[FLjava/util/BitSet;)V CLASS dle$c Translation - FIELD a DOWN Ldle$c; - FIELD b UP Ldle$c; - FIELD c NORTH Ldle$c; - FIELD d SOUTH Ldle$c; - FIELD e WEST Ldle$c; - FIELD f EAST Ldle$c; FIELD g firstCorner I FIELD h secondCorner I FIELD i thirdCorner I @@ -29,18 +17,6 @@ CLASS dle net/minecraft/client/render/block/BlockModelRenderer FIELD k VALUES [Ldle$c; METHOD a getTranslations (Lfa;)Ldle$c; CLASS dle$d NeighborOrientation - FIELD a DOWN Ldle$d; - FIELD b UP Ldle$d; - FIELD c NORTH Ldle$d; - FIELD d SOUTH Ldle$d; - FIELD e WEST Ldle$d; - FIELD f EAST Ldle$d; - FIELD g FLIP_DOWN Ldle$d; - FIELD h FLIP_UP Ldle$d; - FIELD i FLIP_NORTH Ldle$d; - FIELD j FLIP_SOUTH Ldle$d; - FIELD k FLIP_WEST Ldle$d; - FIELD l FLIP_EAST Ldle$d; FIELD m shape I FIELD a colorMap Lcvv; FIELD b brightnessCache Ljava/lang/ThreadLocal; diff --git a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping index d098c0dab4..2dc5158887 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping @@ -1,11 +1,4 @@ CLASS avy net/minecraft/client/render/entity/PlayerModelPart - FIELD a CAPE Lavy; - FIELD b BODY Lavy; - FIELD c LEFT_ARM Lavy; - FIELD d RIGHT_ARM Lavy; - FIELD e LEFT_LEG Lavy; - FIELD f RIGHT_LEG Lavy; - FIELD g HEAD Lavy; FIELD h id I FIELD i bitFlag I FIELD j name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping index 3c8a6fabdf..e638616fd9 100644 --- a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping @@ -1 +1,2 @@ CLASS dfh net/minecraft/client/render/entity/model/ParrotEntityModel + CLASS dfh$a Pose diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping index 2181701087..83b3f7cfe8 100644 --- a/mappings/net/minecraft/client/render/model/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -1,20 +1,4 @@ CLASS dvv net/minecraft/client/render/model/ModelRotation - FIELD a X0_Y0 Ldvv; - FIELD b X0_Y90 Ldvv; - FIELD c X0_Y180 Ldvv; - FIELD d X0_Y270 Ldvv; - FIELD e X90_Y0 Ldvv; - FIELD f X90_Y90 Ldvv; - FIELD g X90_Y180 Ldvv; - FIELD h X90_Y270 Ldvv; - FIELD i X180_Y0 Ldvv; - FIELD j X180_Y90 Ldvv; - FIELD k X180_Y180 Ldvv; - FIELD l X180_Y270 Ldvv; - FIELD m X270_Y0 Ldvv; - FIELD n X270_Y90 Ldvv; - FIELD o X270_Y180 Ldvv; - FIELD p X270_Y270 Ldvv; FIELD q BY_INDEX Ljava/util/Map; FIELD r index I FIELD s quaternion La; diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping index 373a071684..8b86e7a6a5 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping @@ -13,7 +13,6 @@ CLASS dls net/minecraft/client/render/model/json/ModelTransformation ARG 2 unused ARG 3 context CLASS dls$b Type - FIELD i FIXED Ldls$b; FIELD a NONE Ldls; FIELD b globalTranslationX F FIELD c globalTranslationY F diff --git a/mappings/net/minecraft/client/tutorial/TutorialStep.mapping b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping index 4f3f250863..a7cd483371 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStep.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping @@ -1,10 +1,4 @@ CLASS dyg net/minecraft/client/tutorial/TutorialStep - FIELD a MOVEMENT Ldyg; - FIELD b FIND_TREE Ldyg; - FIELD c PUNCH_TREE Ldyg; - FIELD d OPEN_INVENTORY Ldyg; - FIELD e CRAFT_PLANKS Ldyg; - FIELD f NONE Ldyg; FIELD g name Ljava/lang/String; FIELD h handlerFactory Ljava/util/function/Function; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/InputUtil.mapping b/mappings/net/minecraft/client/util/InputUtil.mapping index f25593970a..6f3ddce3b8 100644 --- a/mappings/net/minecraft/client/util/InputUtil.mapping +++ b/mappings/net/minecraft/client/util/InputUtil.mapping @@ -13,6 +13,8 @@ CLASS ctr net/minecraft/client/util/InputUtil METHOD equals (Ljava/lang/Object;)Z ARG 1 o CLASS ctr$b Type + FIELD a KEYSYM Lctr$b; + FIELD c MOUSE Lctr$b; FIELD d mouseButtons [Ljava/lang/String; FIELD e map Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD f name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index cd92be7445..0d6b6529be 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -1,7 +1,5 @@ CLASS cvt net/minecraft/client/util/Session CLASS cvt$a AccountType - FIELD a LEGACY Lcvt$a; - FIELD b MOJANG Lcvt$a; METHOD a byName (Ljava/lang/String;)Lcvt$a; FIELD a username Ljava/lang/String; FIELD b uuid Ljava/lang/String; diff --git a/mappings/net/minecraft/container/ContainerType.mapping b/mappings/net/minecraft/container/ContainerType.mapping index 6ed46b00a9..3902431e9b 100644 --- a/mappings/net/minecraft/container/ContainerType.mapping +++ b/mappings/net/minecraft/container/ContainerType.mapping @@ -3,24 +3,6 @@ CLASS azc net/minecraft/container/ContainerType METHOD create (ILavw;)Layb; ARG 1 syncId ARG 2 playerInventory - FIELD c GENERIC_9X3 Lazc; - FIELD f GENERIC_9X6 Lazc; - FIELD g GENERIC_3X3 Lazc; - FIELD h ANVIL Lazc; - FIELD i BEACON Lazc; - FIELD j BLAST_FURNACE Lazc; - FIELD k BREWING_STAND Lazc; - FIELD l CRAFTING Lazc; - FIELD m ENCHANTMENT Lazc; - FIELD n FURNACE Lazc; - FIELD o GRINDSTONE Lazc; - FIELD p HOPPER Lazc; - FIELD q LECTERN Lazc; - FIELD r LOOM Lazc; - FIELD s MERCHANT Lazc; - FIELD t SHULKER_BOX Lazc; - FIELD u SMOKER Lazc; - FIELD v CARTOGRAPHY Lazc; FIELD x factory Lazc$a; METHOD (Lazc$a;)V ARG 1 factory diff --git a/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping b/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping index f1a9db0384..cbce0c7b66 100644 --- a/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping +++ b/mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping @@ -6,20 +6,9 @@ CLASS aaz net/minecraft/datafixers/fixes/ChunkPalettedStorageFix ARG 2 y CLASS aaz$b Facing CLASS aaz$b$a Axis - FIELD a X Laaz$b$a; - FIELD b Y Laaz$b$a; - FIELD c Z Laaz$b$a; CLASS aaz$b$b Direction - FIELD a POSITIVE Laaz$b$b; - FIELD b NEGATIVE Laaz$b$b; FIELD c offset I METHOD a getOffset ()I - FIELD a DOWN Laaz$b; - FIELD b UP Laaz$b; - FIELD c NORTH Laaz$b; - FIELD d SOUTH Laaz$b; - FIELD e WEST Laaz$b; - FIELD f EAST Laaz$b; FIELD g axis Laaz$b$a; FIELD h direction Laaz$b$b; METHOD (Ljava/lang/String;ILaaz$b$b;Laaz$b$a;)V diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 5b604fbcda..5824d97d7d 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -1,9 +1,5 @@ CLASS bfi net/minecraft/enchantment/Enchantment CLASS bfi$a Weight - FIELD a COMMON Lbfi$a; - FIELD b UNCOMMON Lbfi$a; - FIELD c RARE Lbfi$a; - FIELD d LEGENDARY Lbfi$a; FIELD e weight I METHOD (Ljava/lang/String;II)V ARG 3 weight diff --git a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping index 4d12d32568..f73c210d7e 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping @@ -1,15 +1,15 @@ CLASS bfj net/minecraft/enchantment/EnchantmentTarget FIELD a ALL Lbfj; FIELD b ARMOR Lbfj; - FIELD c FEET Lbfj; - FIELD d LEGS Lbfj; - FIELD e CHEST Lbfj; - FIELD f HELM Lbfj; + FIELD c ARMOR_FEET Lbfj; + FIELD d ARMOR_LEGS Lbfj; + FIELD e ARMOR_CHEST Lbfj; + FIELD f ARMOR_HEAD Lbfj; FIELD g WEAPON Lbfj; - FIELD h BREAKER Lbfj; - FIELD i FISHING Lbfj; + FIELD h DIGGER Lbfj; + FIELD i FISHING_ROD Lbfj; FIELD j TRIDENT Lbfj; - FIELD k TOOL Lbfj; + FIELD k BREAKABLE Lbfj; FIELD l BOW Lbfj; FIELD m WEARABLE Lbfj; FIELD n CROSSBOW Lbfj; diff --git a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping index aebf7c76ac..f375cf16d2 100644 --- a/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping @@ -1,10 +1,5 @@ CLASS bfv net/minecraft/enchantment/ProtectionEnchantment CLASS bfv$a Type - FIELD a ALL Lbfv$a; - FIELD b FIRE Lbfv$a; - FIELD c FALL Lbfv$a; - FIELD d EXPLOSION Lbfv$a; - FIELD e PROJECTILE Lbfv$a; FIELD f name Ljava/lang/String; FIELD g basePower I FIELD h powerPerLevel I diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index a98210a1d7..a7d532fc9d 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -14,83 +14,8 @@ CLASS aij net/minecraft/entity/EntityType METHOD a build (Ljava/lang/String;)Laij; METHOD b disableSaving ()Laij$a; CLASS aij$b EntityFactory - FIELD A FIREWORK_ROCKET Laij; - FIELD C GHAST Laij; - FIELD D GIANT Laij; - FIELD E GUARDIAN Laij; - FIELD F HORSE Laij; - FIELD G HUSK Laij; - FIELD H ILLUSIONER Laij; - FIELD I ITEM Laij; - FIELD J ITEM_FRAME Laij; - FIELD K FIREBALL Laij; - FIELD L LEASH_KNOT Laij; - FIELD M LLAMA Laij; - FIELD N LLAMA_SPIT Laij; - FIELD O MAGMA_CUBE Laij; - FIELD P MINECART Laij; - FIELD Q CHEST_MINECART Laij; - FIELD R COMMAND_BLOCK_MINECART Laij; - FIELD S FURNACE_MINECART Laij; - FIELD T HOPPER_MINECART Laij; - FIELD U SPAWNER_MINECART Laij; - FIELD V TNT_MINECART Laij; - FIELD W MULE Laij; - FIELD X MOOSHROOM Laij; - FIELD Y OCELOT Laij; - FIELD Z PAINTING Laij; - FIELD aA EGG Laij; - FIELD aB ENDER_PEARL Laij; - FIELD aC EXPERIENCE_BOTTLE Laij; - FIELD aD POTION Laij; - FIELD aE TRIDENT Laij; - FIELD aF VEX Laij; - FIELD aG VILLAGER Laij; - FIELD aH IRON_GOLEM Laij; - FIELD aI VINDICATOR Laij; - FIELD aJ PILLAGER Laij; - FIELD aL WITCH Laij; - FIELD a AREA_EFFECT_CLOUD Laij; - FIELD aM WITHER Laij; - FIELD aN WITHER_SKELETON Laij; - FIELD aO WITHER_SKULL Laij; - FIELD aP WOLF Laij; - FIELD aQ ZOMBIE Laij; - FIELD aR ZOMBIE_HORSE Laij; - FIELD aS ZOMBIE_VILLAGER Laij; - FIELD aT PHANTOM Laij; - FIELD aU RAVAGER Laij; - FIELD aV LIGHTNING_BOLT Laij; - FIELD aW PLAYER Laij; - FIELD aX FISHING_BOBBER Laij; FIELD aY LOGGER Lorg/apache/logging/log4j/Logger; FIELD aZ factory Laij$b; - FIELD aa PANDA Laij; - FIELD ab PARROT Laij; - FIELD ac PIG Laij; - FIELD ad PUFFERFISH Laij; - FIELD ae ZOMBIE_PIGMAN Laij; - FIELD af POLAR_BEAR Laij; - FIELD ag TNT Laij; - FIELD ah RABBIT Laij; - FIELD ai SALMON Laij; - FIELD aj SHEEP Laij; - FIELD ak SHULKER Laij; - FIELD al SHULKER_BULLET Laij; - FIELD am SILVERFISH Laij; - FIELD an SKELETON Laij; - FIELD ao SKELETON_HORSE Laij; - FIELD ap SLIME Laij; - FIELD aq SMALL_FIREBALL Laij; - FIELD ar SNOW_GOLEM Laij; - FIELD as SNOWBALL Laij; - FIELD at SPECTRAL_ARROW Laij; - FIELD au SPIDER Laij; - FIELD av SQUID Laij; - FIELD aw STRAY Laij; - FIELD ay TROPICAL_FISH Laij; - FIELD az TURTLE Laij; - FIELD b ARMOR_STAND Laij; FIELD ba category Laiq; FIELD bb saveable Z FIELD bc summonable Z @@ -100,30 +25,6 @@ CLASS aij net/minecraft/entity/EntityType FIELD bg lootTableId Lqs; FIELD bh dataFixerType Lcom/mojang/datafixers/types/Type; FIELD bi size Laig; - FIELD c ARROW Laij; - FIELD d BAT Laij; - FIELD e BLAZE Laij; - FIELD f BOAT Laij; - FIELD g CAT Laij; - FIELD h CAVE_SPIDER Laij; - FIELD i CHICKEN Laij; - FIELD j COD Laij; - FIELD k COW Laij; - FIELD l CREEPER Laij; - FIELD m DONKEY Laij; - FIELD n DOLPHIN Laij; - FIELD o DRAGON_FIREBALL Laij; - FIELD p DROWNED Laij; - FIELD q ELDER_GUARDIAN Laij; - FIELD r END_CRYSTAL Laij; - FIELD s ENDER_DRAGON Laij; - FIELD t ENDERMAN Laij; - FIELD u ENDERMITE Laij; - FIELD v EVOKER_FANGS Laij; - FIELD w EVOKER Laij; - FIELD x EXPERIENCE_ORB Laij; - FIELD y EYE_OF_ENDER Laij; - FIELD z FALLING_BLOCK Laij; METHOD (Laij$b;Laiq;ZZZLcom/mojang/datafixers/types/Type;Laig;)V ARG 1 factory ARG 2 category diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 7da06896c8..ad3dc40a16 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -1,13 +1,5 @@ CLASS aik net/minecraft/entity/EquipmentSlot CLASS aik$a Type - FIELD a HAND Laik$a; - FIELD b ARMOR Laik$a; - FIELD a HAND_MAIN Laik; - FIELD b HAND_OFF Laik; - FIELD c FEET Laik; - FIELD d LEGS Laik; - FIELD e CHEST Laik; - FIELD f HEAD Laik; FIELD g type Laik$a; FIELD h entityId I FIELD i armorStandId I diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 3597528792..7f0bd605e8 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -4,6 +4,8 @@ CLASS ajw net/minecraft/entity/ai/brain/task/CompositeTask METHOD a apply (Lalr;)V ARG 1 list CLASS ajw$b RunMode + FIELD a RUN_ALL Lajw$b; + FIELD b TRY_ALL Lajw$b; FIELD a requiredMemoryState Ljava/util/Set; FIELD b memoriesToForgetWhenStopped Ljava/util/Set; FIELD c order Lajw$a; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping index d4f95f5dd2..0908686cc3 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping @@ -1,7 +1,7 @@ CLASS byg net/minecraft/entity/boss/dragon/EnderDragonSpawnState FIELD a START Lbyg; - FIELD b PREPARE_CREATE_SPIKES Lbyg; - FIELD c CREATE_SPIKES Lbyg; - FIELD d SPAWN_DRAGON Lbyg; + FIELD b PREPARING_TO_SUMMON_PILLARS Lbyg; + FIELD c SUMMONING_PILLARS Lbyg; + FIELD d SUMMONING_DRAGOM Lbyg; FIELD e END Lbyg; METHOD a run (Lvg;Lbyh;Ljava/util/List;ILev;)V diff --git a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping index 663d97eb85..1ad98e801d 100644 --- a/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/phase/PhaseType.mapping @@ -1,15 +1,4 @@ CLASS asw net/minecraft/entity/boss/dragon/phase/PhaseType - FIELD a HOLDING_PATTERN Lasw; - FIELD b STRAFE_PLAYER Lasw; - FIELD c LANDING_APPROACH Lasw; - FIELD d LANDING Lasw; - FIELD e TAKEOFF Lasw; - FIELD f SITTING_FLAMING Lasw; - FIELD g SITTING_SCANNING Lasw; - FIELD h SITTING_ATTACKING Lasw; - FIELD i CHARGING_PLAYER Lasw; - FIELD j DYING Lasw; - FIELD k HOVER Lasw; FIELD l types [Lasw; FIELD m phaseClass Ljava/lang/Class; FIELD n id I diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index c88ddaeeaa..a228f6a92b 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -1,10 +1,5 @@ CLASS avx net/minecraft/entity/player/PlayerEntity CLASS avx$a SleepFailureReason - FIELD a INVALID_WORLD Lavx$a; - FIELD b WRONG_TIME Lavx$a; - FIELD c TOO_FAR_AWAY Lavx$a; - FIELD e INVALID_ATTEMPT Lavx$a; - FIELD f NOT_SAFE Lavx$a; FIELD g text Ljm; METHOD a getText ()Ljm; FIELD bA container Layb; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 254b234f6f..244fe8ba0b 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -1,8 +1,5 @@ CLASS awb net/minecraft/entity/projectile/ProjectileEntity - CLASS awb$a PickupType - FIELD a NO_PICKUP Lawb$a; - FIELD b PICKUP Lawb$a; - FIELD c CREATIVE_PICKUP Lawb$a; + CLASS awb$a PickupPermission METHOD a fromOrdinal (I)Lawb$a; FIELD aA piercingKilledEntities Ljava/util/List; FIELD ar PROJECTILE_FLAGS Lqh; diff --git a/mappings/net/minecraft/entity/raid/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping index 32c9703aa5..8de10c9bb5 100644 --- a/mappings/net/minecraft/entity/raid/Raid.mapping +++ b/mappings/net/minecraft/entity/raid/Raid.mapping @@ -4,11 +4,6 @@ CLASS axb net/minecraft/entity/raid/Raid METHOD a getName ()Ljava/lang/String; METHOD b fromName (Ljava/lang/String;)Laxb$a; CLASS axb$b Member - FIELD a VINDICATOR Laxb$b; - FIELD b EVOKER Laxb$b; - FIELD c PILLAGER Laxb$b; - FIELD d WITCH Laxb$b; - FIELD e RAVAGER Laxb$b; FIELD f VALUES [Laxb$b; FIELD g type Laij; FIELD h waveToCount [I diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index 3b32bd5b6f..98b753ecee 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -1,12 +1,6 @@ CLASS axn net/minecraft/entity/vehicle/BoatEntity CLASS axn$a Location CLASS axn$b Type - FIELD a OAK Laxn$b; - FIELD b SPRUCE Laxn$b; - FIELD c BIRCH Laxn$b; - FIELD d JUNGLE Laxn$b; - FIELD e ACACIA Laxn$b; - FIELD f DARK_OAK Laxn$b; FIELD g name Ljava/lang/String; FIELD h baseBlock Lbml; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/fluid/Fluids.mapping b/mappings/net/minecraft/fluid/Fluids.mapping index 59d3b78409..ca516d1327 100644 --- a/mappings/net/minecraft/fluid/Fluids.mapping +++ b/mappings/net/minecraft/fluid/Fluids.mapping @@ -1,5 +1,4 @@ CLASS clb net/minecraft/fluid/Fluids - FIELD a EMPTY Lcky; FIELD b FLOWING_WATER Lckx; FIELD c WATER Lckx; FIELD d FLOWING_LAVA Lckx; diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index ed2cdd68d5..fd7770cbc5 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -1,4 +1,5 @@ CLASS azw net/minecraft/item/ArmorMaterials + FIELD b CHAIN Lazw; FIELD g BASE_DURABILITY [I FIELD h name Ljava/lang/String; FIELD i durabilityMultiplier I diff --git a/mappings/net/minecraft/network/NetworkSide.mapping b/mappings/net/minecraft/network/NetworkSide.mapping index e1cdf0ab73..b618682a18 100644 --- a/mappings/net/minecraft/network/NetworkSide.mapping +++ b/mappings/net/minecraft/network/NetworkSide.mapping @@ -1,3 +1 @@ CLASS kb net/minecraft/network/NetworkSide - FIELD a SERVER Lkb; - FIELD b CLIENT Lkb; diff --git a/mappings/net/minecraft/network/chat/ClickEvent.mapping b/mappings/net/minecraft/network/chat/ClickEvent.mapping index 1f7aa89b92..12553db005 100644 --- a/mappings/net/minecraft/network/chat/ClickEvent.mapping +++ b/mappings/net/minecraft/network/chat/ClickEvent.mapping @@ -1,10 +1,5 @@ CLASS jl net/minecraft/network/chat/ClickEvent CLASS jl$a Action - FIELD a OPEN_URL Ljl$a; - FIELD b OPEN_FILE Ljl$a; - FIELD c RUN_COMMAND Ljl$a; - FIELD d SUGGEST_COMMAND Ljl$a; - FIELD e CHANGE_PAGE Ljl$a; FIELD f ACTIONS Ljava/util/Map; FIELD g safe Z FIELD h name Ljava/lang/String; diff --git a/mappings/net/minecraft/network/chat/HoverEvent.mapping b/mappings/net/minecraft/network/chat/HoverEvent.mapping index b27573cf96..60e3de45b5 100644 --- a/mappings/net/minecraft/network/chat/HoverEvent.mapping +++ b/mappings/net/minecraft/network/chat/HoverEvent.mapping @@ -1,8 +1,5 @@ CLASS jp net/minecraft/network/chat/HoverEvent CLASS jp$a Action - FIELD a SHOW_TEXT Ljp$a; - FIELD b SHOW_ITEM Ljp$a; - FIELD c SHOW_ENTITY Ljp$a; FIELD d ACTIONS Ljava/util/Map; FIELD e safe Z FIELD f name Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping b/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping index cea469d709..c2a6fd5b8a 100644 --- a/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping +++ b/mappings/net/minecraft/resource/ResourcePackCompatibility.mapping @@ -1,4 +1,6 @@ CLASS ws net/minecraft/resource/ResourcePackCompatibility + FIELD a TOO_OLD Lws; + FIELD b TOO_NEW Lws; FIELD d notification Ljm; FIELD e confirmMessage Ljm; METHOD a isCompatible ()Z diff --git a/mappings/net/minecraft/resource/ResourceType.mapping b/mappings/net/minecraft/resource/ResourceType.mapping index 4e3123e056..a9425015fe 100644 --- a/mappings/net/minecraft/resource/ResourceType.mapping +++ b/mappings/net/minecraft/resource/ResourceType.mapping @@ -1,5 +1,3 @@ CLASS wi net/minecraft/resource/ResourceType - FIELD a ASSETS Lwi; - FIELD b DATA Lwi; FIELD c name Ljava/lang/String; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping index 5dcbf7649b..23b36b0cfd 100644 --- a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping @@ -1,6 +1,5 @@ CLASS csx net/minecraft/scoreboard/AbstractTeam CLASS csx$a CollisionRule - FIELD a ALWAYS Lcsx$a; FIELD e name Ljava/lang/String; FIELD f value I FIELD g COLLISION_RULES Ljava/util/Map; @@ -11,10 +10,6 @@ CLASS csx net/minecraft/scoreboard/AbstractTeam ARG 0 name METHOD b getTranslationKey ()Ljm; CLASS csx$b VisibilityRule - FIELD a ALWAYS Lcsx$b; - FIELD b NEVER Lcsx$b; - FIELD c HIDDEN_FOR_OTHER_TEAMS Lcsx$b; - FIELD d HIDDEN_FOR_TEAM Lcsx$b; FIELD e name Ljava/lang/String; FIELD f value I FIELD g VISIBILITY_RULES Ljava/util/Map; diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 38a2c3eac0..5cd8d78505 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -1,23 +1,10 @@ CLASS csy net/minecraft/scoreboard/ScoreboardCriterion CLASS csy$a RenderType - FIELD a INTEGER Lcsy$a; - FIELD b HEARTS Lcsy$a; FIELD c name Ljava/lang/String; FIELD d CRITERION_TYPES Ljava/util/Map; METHOD a getName ()Ljava/lang/String; METHOD a getType (Ljava/lang/String;)Lcsy$a; FIELD a OBJECTIVES Ljava/util/Map; - FIELD b DUMMY Lcsy; - FIELD c TRIGGER Lcsy; - FIELD d DEATH_COUNT Lcsy; - FIELD e PLAYER_KILL_COUNT Lcsy; - FIELD f TOTAL_KILL_COUNT Lcsy; - FIELD g HEALTH Lcsy; - FIELD h FOOD Lcsy; - FIELD i AIR Lcsy; - FIELD j ARMOR Lcsy; - FIELD k XP Lcsy; - FIELD l LEVEL Lcsy; FIELD m TEAM_KILLS [Lcsy; FIELD n KILLED_BY_TEAMS [Lcsy; FIELD o name Ljava/lang/String; diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 449c295f41..3783cad0ed 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -2,9 +2,6 @@ CLASS ur net/minecraft/server/world/ChunkHolder CLASS ur$a Unloaded FIELD b INSTANCE Lur$a; CLASS ur$b LevelType - FIELD a BORDER Lur$b; - FIELD b TICKING Lur$b; - FIELD c ENTITY_TICKING Lur$b; METHOD a isAfter (Lur$b;)Z ARG 1 levelType CLASS ur$c LevelUpdateListener diff --git a/mappings/net/minecraft/server/world/ChunkTicketType.mapping b/mappings/net/minecraft/server/world/ChunkTicketType.mapping index 24043a8a4b..e865df0a48 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketType.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketType.mapping @@ -1,9 +1,4 @@ CLASS vl net/minecraft/server/world/ChunkTicketType - FIELD a START Lvl; - FIELD b DRAGON Lvl; - FIELD c PLAYER Lvl; - FIELD d FORCED Lvl; - FIELD g UNKNOWN Lvl; FIELD h name Ljava/lang/String; FIELD i argumentComparator Ljava/util/Comparator; METHOD (Ljava/lang/String;Ljava/util/Comparator;)V diff --git a/mappings/net/minecraft/sound/SoundCategory.mapping b/mappings/net/minecraft/sound/SoundCategory.mapping index be3ea515ae..314efff8af 100644 --- a/mappings/net/minecraft/sound/SoundCategory.mapping +++ b/mappings/net/minecraft/sound/SoundCategory.mapping @@ -1,4 +1,5 @@ CLASS yl net/minecraft/sound/SoundCategory + FIELD h PLAYERS Lyl; FIELD k NAME_MAP Ljava/util/Map; FIELD l name Ljava/lang/String; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/structure/StructureFeatures.mapping b/mappings/net/minecraft/structure/StructureFeatures.mapping index 2dde3f8988..45579f0a4b 100644 --- a/mappings/net/minecraft/structure/StructureFeatures.mapping +++ b/mappings/net/minecraft/structure/StructureFeatures.mapping @@ -1,19 +1,4 @@ CLASS cii net/minecraft/structure/StructureFeatures - FIELD a MINESHAFT Lcej; - FIELD b PILLAGER_OUTPOST Lcej; - FIELD c FORTRESS Lcej; - FIELD d STRONGHOLD Lcej; - FIELD e JUNGLE_PYRAMID Lcej; - FIELD f OCEAN_RUIN Lcej; - FIELD g DESERT_PYRAMID Lcej; - FIELD h IGLOO Lcej; - FIELD i SWAMP_HUT Lcej; - FIELD j MONUMENT Lcej; - FIELD k END_CITY Lcej; - FIELD l MANSION Lcej; - FIELD m BURIED_TREASURE Lcej; - FIELD n SHIPWRECK Lcej; - FIELD o VILLAGE Lcej; FIELD p LOGGER Lorg/apache/logging/log4j/Logger; METHOD a initialize ()V METHOD a readStructureStart (Lbwy;Lcje;Lbig;Lib;)Lcil; diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping index 725f3470af..ecf6cf9d48 100644 --- a/mappings/net/minecraft/structure/StructurePieceType.mapping +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -53,7 +53,7 @@ CLASS cek net/minecraft/structure/StructurePieceType FIELD w STRONGHOLD_SMALL_CORRIDOR Lcek; FIELD x STRONGHOLD_FIVE_WAY_CROSSING Lcek; FIELD y STRONGHOLD_LEFT_TURN Lcek; - FIELD z STRONGJOLD_LIBRARY Lcek; + FIELD z STRONGHOLD_LIBRARY Lcek; METHOD a register (Lcek;Ljava/lang/String;)Lcek; ARG 0 pieceType ARG 1 id diff --git a/mappings/net/minecraft/structure/pool/StructurePool.mapping b/mappings/net/minecraft/structure/pool/StructurePool.mapping index b9daf762bb..6e1fcab5cb 100644 --- a/mappings/net/minecraft/structure/pool/StructurePool.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePool.mapping @@ -1,7 +1,5 @@ CLASS cfi net/minecraft/structure/pool/StructurePool CLASS cfi$a Projection - FIELD a TERRAIN_MATCHING Lcfi$a; - FIELD b RIGID Lcfi$a; FIELD c PROJECTIONS_BY_ID Ljava/util/Map; FIELD d id Ljava/lang/String; FIELD e processors Lcom/google/common/collect/ImmutableList; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping index 0ecb89eba6..5757d6a6bb 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElementType.mapping @@ -1,6 +1,2 @@ CLASS cfh net/minecraft/structure/pool/StructurePoolElementType - FIELD b SINGLE_POOL_ELEMENT Lcfh; - FIELD c LIST_POOL_ELEMENT Lcfh; - FIELD d FEATURE_POOL_ELEMENT Lcfh; - FIELD e EMPTY_POOL_ELEMENT Lcfh; METHOD a register (Ljava/lang/String;Lcfh;)Lcfh; diff --git a/mappings/net/minecraft/util/ActionResult.mapping b/mappings/net/minecraft/util/ActionResult.mapping index 60f48de73b..a6d1e57bc1 100644 --- a/mappings/net/minecraft/util/ActionResult.mapping +++ b/mappings/net/minecraft/util/ActionResult.mapping @@ -1,2 +1 @@ CLASS aha net/minecraft/util/ActionResult - FIELD b PASS Laha; diff --git a/mappings/net/minecraft/util/BlockMirror.mapping b/mappings/net/minecraft/util/BlockMirror.mapping index 3ba8c1027a..79da74811b 100644 --- a/mappings/net/minecraft/util/BlockMirror.mapping +++ b/mappings/net/minecraft/util/BlockMirror.mapping @@ -1,7 +1,4 @@ CLASS bpw net/minecraft/util/BlockMirror - FIELD a NONE Lbpw; - FIELD b LEFT_RIGHT Lbpw; - FIELD c FRONT_BACK Lbpw; METHOD a mirror (II)I ARG 1 rotation ARG 2 fullTurn diff --git a/mappings/net/minecraft/util/BlockRotation.mapping b/mappings/net/minecraft/util/BlockRotation.mapping index 3fab754ceb..7a7b405711 100644 --- a/mappings/net/minecraft/util/BlockRotation.mapping +++ b/mappings/net/minecraft/util/BlockRotation.mapping @@ -1,8 +1,4 @@ CLASS bqw net/minecraft/util/BlockRotation - FIELD a ROT_0 Lbqw; - FIELD b ROT_90 Lbqw; - FIELD c ROT_180 Lbqw; - FIELD d ROT_270 Lbqw; METHOD a rotate (II)I ARG 1 rotation ARG 2 fullTurn diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 9c23955666..b798a9e748 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -1,5 +1,4 @@ CLASS bax net/minecraft/util/DyeColor - FIELD p BLACK Lbax; FIELD q VALUES [Lbax; FIELD r BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; FIELD s id I diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index f181df2c6b..3393f555fc 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -1,12 +1,8 @@ CLASS p net/minecraft/util/SystemUtil CLASS p$a IdentityHashStrategy - FIELD a INSTANCE Lp$a; CLASS p$b OperatingSystem - FIELD a UNIX Lp$b; - FIELD b SOLARIS Lp$b; FIELD c WINDOWS Lp$b; FIELD d MAC Lp$b; - FIELD e UNKNOWN Lp$b; METHOD a open (Ljava/io/File;)V METHOD a open (Ljava/lang/String;)V METHOD a open (Ljava/net/URI;)V diff --git a/mappings/net/minecraft/util/Void.mapping b/mappings/net/minecraft/util/Void.mapping index 12629e0e50..89e9b50271 100644 --- a/mappings/net/minecraft/util/Void.mapping +++ b/mappings/net/minecraft/util/Void.mapping @@ -1,2 +1 @@ CLASS aaa net/minecraft/util/Void - FIELD a INSTANCE Laaa; diff --git a/mappings/net/minecraft/util/hit/HitResult.mapping b/mappings/net/minecraft/util/hit/HitResult.mapping index c79ebb94ff..b9970afa59 100644 --- a/mappings/net/minecraft/util/hit/HitResult.mapping +++ b/mappings/net/minecraft/util/hit/HitResult.mapping @@ -1,8 +1,5 @@ CLASS crt net/minecraft/util/hit/HitResult CLASS crt$a Type - FIELD a NONE Lcrt$a; - FIELD b BLOCK Lcrt$a; - FIELD c ENTITY Lcrt$a; FIELD a pos Lcrv; METHOD (Lcrv;)V ARG 1 pos diff --git a/mappings/net/minecraft/util/math/AxisCycle.mapping b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping similarity index 70% rename from mappings/net/minecraft/util/math/AxisCycle.mapping rename to mappings/net/minecraft/util/math/AxisCycleDirection.mapping index 7e7c871505..dfbd011671 100644 --- a/mappings/net/minecraft/util/math/AxisCycle.mapping +++ b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping @@ -1,7 +1,7 @@ -CLASS eu net/minecraft/util/math/AxisCycle +CLASS eu net/minecraft/util/math/AxisCycleDirection FIELD a NONE Leu; - FIELD b NEXT Leu; - FIELD c PREVIOUS Leu; + FIELD b FORWARD Leu; + FIELD c BACKWARD Leu; FIELD d AXES [Lfa$a; FIELD e VALUES [Leu; METHOD a opposite ()Leu; diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 566def2570..3a75955261 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -34,17 +34,9 @@ CLASS fa net/minecraft/util/math/Direction FIELD d desc Ljava/lang/String; METHOD a offset ()I CLASS fa$c Type - FIELD a HORIZONTAL Lfa$c; - FIELD b VERTICAL Lfa$c; FIELD c facingArray [Lfa; FIELD d axisArray [Lfa$a; METHOD a random (Ljava/util/Random;)Lfa; - FIELD a DOWN Lfa; - FIELD b UP Lfa; - FIELD c NORTH Lfa; - FIELD d SOUTH Lfa; - FIELD e WEST Lfa; - FIELD f EAST Lfa; FIELD g id I FIELD h idOpposite I FIELD i idHorizontal I diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/village/PointOfInterestStorage.mapping index 2cc971caf7..556f1b22c6 100644 --- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/village/PointOfInterestStorage.mapping @@ -3,9 +3,6 @@ CLASS aqg net/minecraft/village/PointOfInterestStorage FIELD b distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap; METHOD a update ()V CLASS aqg$b OccupationStatus - FIELD a HAS_SPACE Laqg$b; - FIELD b IS_OCCUPIED Laqg$b; - FIELD c ANY Laqg$b; FIELD d predicate Ljava/util/function/Predicate; METHOD a getPredicate ()Ljava/util/function/Predicate; FIELD a pointOfInterestDistanceTracker Laqg$a; diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index cd4992e7e7..db05659522 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,8 +1,4 @@ CLASS agx net/minecraft/world/Difficulty - FIELD a PEACEFUL Lagx; - FIELD b EASY Lagx; - FIELD c NORMAL Lagx; - FIELD d HARD Lagx; FIELD e DIFFICULTIES [Lagx; FIELD f id I FIELD g translationKey Ljava/lang/String; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index bf1aa9e08c..2cb084b537 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -17,9 +17,6 @@ CLASS bhd net/minecraft/world/GameRules METHOD a createValue ()Lbhd$a; METHOD b getType ()Lbhd$c; CLASS bhd$c Type - FIELD a STRING Lbhd$c; - FIELD b BOOLEAN Lbhd$c; - FIELD c INTEGER Lbhd$c; FIELD d argumentType Ljava/util/function/Supplier; FIELD e argumentProvider Ljava/util/function/BiFunction; METHOD a set (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lbhd$a;)V diff --git a/mappings/net/minecraft/world/LightType.mapping b/mappings/net/minecraft/world/LightType.mapping index b9dfb82080..3238b6370b 100644 --- a/mappings/net/minecraft/world/LightType.mapping +++ b/mappings/net/minecraft/world/LightType.mapping @@ -1,3 +1 @@ CLASS bhq net/minecraft/world/LightType - FIELD a SKY Lbhq; - FIELD b BLOCK Lbhq; diff --git a/mappings/net/minecraft/world/RayTraceContext.mapping b/mappings/net/minecraft/world/RayTraceContext.mapping index 5ab13dcb1c..2911743b54 100644 --- a/mappings/net/minecraft/world/RayTraceContext.mapping +++ b/mappings/net/minecraft/world/RayTraceContext.mapping @@ -2,7 +2,6 @@ CLASS bgv net/minecraft/world/RayTraceContext CLASS bgv$a ShapeType FIELD c provider Lbgv$c; CLASS bgv$b FluidHandling - FIELD a NONE Lbgv$b; FIELD d predicate Ljava/util/function/Predicate; METHOD a handled (Lckz;)Z CLASS bgv$c ShapeProvider diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 8b8e5152d6..61e3daf5f0 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -23,33 +23,13 @@ CLASS bie net/minecraft/world/biome/Biome METHOD c temperature (F)Lbie$a; METHOD d downfall (F)Lbie$a; CLASS bie$b Category - FIELD a NONE Lbie$b; - FIELD b TAIGA Lbie$b; - FIELD c EXTREME_HILLS Lbie$b; - FIELD d JUNGLE Lbie$b; - FIELD e MESA Lbie$b; - FIELD f PLAINS Lbie$b; - FIELD g SAVANNA Lbie$b; - FIELD h ICY Lbie$b; - FIELD i THE_END Lbie$b; - FIELD j BEACH Lbie$b; - FIELD k FOREST Lbie$b; - FIELD l OCEAN Lbie$b; - FIELD m DESERT Lbie$b; - FIELD n RIVER Lbie$b; - FIELD o SWAMP Lbie$b; - FIELD p MUSHROOM Lbie$b; - FIELD q NETHER Lbie$b; + FIELD i THEEND Lbie$b; FIELD r NAME_MAP Ljava/util/Map; FIELD s name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD a getName ()Ljava/lang/String; CLASS bie$c TemperatureGroup - FIELD a OCEAN Lbie$c; - FIELD b COLD Lbie$c; - FIELD c MEDIUM Lbie$c; - FIELD d WARM Lbie$c; FIELD e NAME_MAP Ljava/util/Map; FIELD f name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/world/biome/layer/AddBambooJungleLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddBambooJungleLayer.mapping index bba4444440..6eefaf4f98 100644 --- a/mappings/net/minecraft/world/biome/layer/AddBambooJungleLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddBambooJungleLayer.mapping @@ -1,4 +1,3 @@ CLASS cmc net/minecraft/world/biome/layer/AddBambooJungleLayer - FIELD a INSTANCE Lcmc; FIELD b JUNGLE_ID I FIELD c BAMBOO_JUNGLE_ID I diff --git a/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping index 574ec76789..468acc67fd 100644 --- a/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddEdgeBiomesLayer.mapping @@ -1,5 +1,4 @@ CLASS cmj net/minecraft/world/biome/layer/AddEdgeBiomesLayer - FIELD a INSTANCE Lcmj; FIELD b BEACH_ID I FIELD c SNOWY_BEACH_ID I FIELD d DESERT_ID I diff --git a/mappings/net/minecraft/world/biome/layer/AddMushroomIslandLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddMushroomIslandLayer.mapping index 013a962864..7202cda159 100644 --- a/mappings/net/minecraft/world/biome/layer/AddMushroomIslandLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddMushroomIslandLayer.mapping @@ -1,3 +1,2 @@ CLASS clt net/minecraft/world/biome/layer/AddMushroomIslandLayer - FIELD a INSTANCE Lclt; FIELD b MUSHROOM_FIELDS_ID I diff --git a/mappings/net/minecraft/world/biome/layer/AddSunflowerPlainsLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddSunflowerPlainsLayer.mapping index cf2258b21b..3ba4abc16e 100644 --- a/mappings/net/minecraft/world/biome/layer/AddSunflowerPlainsLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/AddSunflowerPlainsLayer.mapping @@ -1,4 +1,3 @@ CLASS cmd net/minecraft/world/biome/layer/AddSunflowerPlainsLayer - FIELD a INSTANCE Lcmd; FIELD b PLAINS_ID I FIELD c SUNFLOWER_PLAINS I diff --git a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping index d7230a92bd..ea7559b908 100644 --- a/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/EaseBiomeEdgeLayer.mapping @@ -1,5 +1,4 @@ CLASS clv net/minecraft/world/biome/layer/EaseBiomeEdgeLayer - FIELD a INSTANCE Lclv; FIELD b DESERT_ID I FIELD c MOUNTAINS_ID I FIELD d WOODED_MOUNTAINS_ID I diff --git a/mappings/net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer.mapping b/mappings/net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer.mapping index 1a2e0419da..3de57d6ab6 100644 --- a/mappings/net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer.mapping @@ -1,2 +1 @@ CLASS cls net/minecraft/world/biome/layer/IncreaseEdgeCurvatureLayer - FIELD a INSTANCE Lcls; diff --git a/mappings/net/minecraft/world/biome/layer/NoiseToRiverLayer.mapping b/mappings/net/minecraft/world/biome/layer/NoiseToRiverLayer.mapping index eaa4504d66..39b15d0f65 100644 --- a/mappings/net/minecraft/world/biome/layer/NoiseToRiverLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/NoiseToRiverLayer.mapping @@ -1,5 +1,4 @@ CLASS cmh net/minecraft/world/biome/layer/NoiseToRiverLayer - FIELD a INSTANCE Lcmh; FIELD b RIVER_ID I METHOD c isValidForRiver (I)I ARG 0 value diff --git a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping index 14fa802e31..c69505028f 100644 --- a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping @@ -1 +1,2 @@ CLASS cmm net/minecraft/world/biome/layer/ScaleLayer + FIELD b FUZZY Lcmm; diff --git a/mappings/net/minecraft/world/border/WorldBorderStage.mapping b/mappings/net/minecraft/world/border/WorldBorderStage.mapping index 361f58a671..e521221d11 100644 --- a/mappings/net/minecraft/world/border/WorldBorderStage.mapping +++ b/mappings/net/minecraft/world/border/WorldBorderStage.mapping @@ -1,6 +1,3 @@ CLASS bwu net/minecraft/world/border/WorldBorderStage - FIELD a GROWING Lbwu; - FIELD b SHRINKING Lbwu; - FIELD c STATIC Lbwu; FIELD d color I METHOD a getColor ()I diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 0072e1a666..bd33338341 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -4,8 +4,6 @@ CLASS bxc net/minecraft/world/chunk/ChunkStatus ARG 1 targetStatus ARG 3 generator CLASS bxc$b ChunkType - FIELD a PROTOCHUNK Lbxc$b; - FIELD b LEVELCHUNK Lbxc$b; CLASS bxc$c SimpleTask METHOD doWork (Lbxc;Lvg;Lbwy;Lcje;Lvj;Ljava/util/function/Function;Ljava/util/List;Lbwx;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus @@ -13,19 +11,6 @@ CLASS bxc net/minecraft/world/chunk/ChunkStatus METHOD doWork (Lvg;Lbwy;Ljava/util/List;Lbwx;)V ARG 2 generator ARG 4 chunk - FIELD a EMPTY Lbxc; - FIELD b STRUCTURE_STARTS Lbxc; - FIELD c STRUCTURE_REFERENCES Lbxc; - FIELD d BIOMES Lbxc; - FIELD e NOISE Lbxc; - FIELD f SURFACE Lbxc; - FIELD g CARVERS Lbxc; - FIELD h LIQUID_CARVERS Lbxc; - FIELD i FEATURES Lbxc; - FIELD j LIGHT Lbxc; - FIELD k SPAWN Lbxc; - FIELD l HEIGHTMAPS Lbxc; - FIELD m FULL Lbxc; FIELD n PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD o POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD p DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 8e3ab761dc..ec01849c93 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -1,4 +1,10 @@ CLASS bxt net/minecraft/world/chunk/UpgradeData + CLASS bxt$b + FIELD a BLACKLIST Lbxt$b; + FIELD b DEFAULT Lbxt$b; + FIELD c CHEST Lbxt$b; + FIELD d LEAVES Lbxt$b; + FIELD e STEM_BLOCK Lbxt$b; FIELD a NO_UPGRADE_DATA Lbxt; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD d sides Ljava/util/EnumSet; diff --git a/mappings/net/minecraft/world/gen/GenerationStep.mapping b/mappings/net/minecraft/world/gen/GenerationStep.mapping index 1f1536a567..53b81bf9d8 100644 --- a/mappings/net/minecraft/world/gen/GenerationStep.mapping +++ b/mappings/net/minecraft/world/gen/GenerationStep.mapping @@ -1,21 +1,11 @@ CLASS byp net/minecraft/world/gen/GenerationStep CLASS byp$a Carver - FIELD a AIR Lbyp$a; - FIELD b LIQUID Lbyp$a; FIELD c BY_NAME Ljava/util/Map; FIELD d name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD a getName ()Ljava/lang/String; CLASS byp$b Feature - FIELD a RAW_GENERATION Lbyp$b; - FIELD b LOCAL_MODIFICATIONS Lbyp$b; - FIELD c UNDERGROUND_STRUCTURES Lbyp$b; - FIELD d SURFACE_STRUCTURES Lbyp$b; - FIELD e UNDERGROUND_ORES Lbyp$b; - FIELD f UNDERGROUND_DECORATION Lbyp$b; - FIELD g VEGETAL_DECORATION Lbyp$b; - FIELD h TOP_LAYER_MODIFICATION Lbyp$b; FIELD i BY_NAME Ljava/util/Map; FIELD j name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index be5552d812..99e492b0aa 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -1,9 +1,4 @@ CLASS bzj net/minecraft/world/gen/carver/Carver - FIELD a CAVE Lbzj; - FIELD b NETHER_CAVE Lbzj; - FIELD c RAVINE Lbzj; - FIELD d UNDERWATER_RAVINE Lbzj; - FIELD e UNDERWATER_CAVE Lbzj; FIELD f AIR Lbvj; FIELD g CAVE_AIR Lbvj; FIELD h WATER Lckz; diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index 069318045b..320b92808d 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -1,6 +1,5 @@ CLASS cgt net/minecraft/world/gen/decorator/Decorator FIELD M configDeserializer Ljava/util/function/Function; - FIELD h NOPE Lcgt; METHOD (Ljava/util/function/Function;)V ARG 1 configDeserializer METHOD a getPositions (Lbhi;Lbwy;Ljava/util/Random;Lcan;Lev;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping index 7621ca922b..8c927fd3c4 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping @@ -4,8 +4,6 @@ CLASS ccn net/minecraft/world/gen/feature/MineshaftFeature ARG 2 chunkX ARG 3 chunkZ CLASS ccn$b Type - FIELD a NORMAL Lccn$b; - FIELD b MESA Lccn$b; FIELD c nameMap Ljava/util/Map; FIELD d name Ljava/lang/String; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 60f9448d62..435d97ac71 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -4,8 +4,6 @@ CLASS cib net/minecraft/world/gen/feature/OceanRuinFeature ARG 2 chunkX ARG 3 chunkZ CLASS cib$b BiomeType - FIELD a WARM Lcib$b; - FIELD b COLD Lcib$b; FIELD c nameMap Ljava/util/Map; FIELD d name Ljava/lang/String; METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index 15373ac2e9..9884fa20dd 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -1,7 +1,5 @@ CLASS ccv net/minecraft/world/gen/feature/OreFeatureConfig CLASS ccv$a Target - FIELD a NATURAL_STONE Lccv$a; - FIELD b NETHERRACK Lccv$a; FIELD c nameMap Ljava/util/Map; FIELD d name Ljava/lang/String; FIELD e predicate Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index ce0ee259b2..0ee4692678 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -5,18 +5,6 @@ CLASS cjw net/minecraft/world/gen/surfacebuilder/SurfaceBuilder FIELD D MYCELIUM_CONFIG Lcjx; FIELD E NETHER_CONFIG Lcjx; FIELD F END_CONFIG Lcjx; - FIELD G DEFAULT Lcjw; - FIELD H MOUNTAIN Lcjw; - FIELD I SHATTERED_SAVANNA Lcjw; - FIELD J GRAVELLY_MOUNTAIN Lcjw; - FIELD K GIANT_TREE_TAIGA Lcjw; - FIELD L SWAMP Lcjw; - FIELD M BADLANDS Lcjw; - FIELD N WOODED_BADLANDS Lcjw; - FIELD O ERODED_BADLANDS Lcjw; - FIELD P FROZEN_OCEAN Lcjw; - FIELD Q NETHER Lcjw; - FIELD R NOPE Lcjw; FIELD a factory Ljava/util/function/Function; FIELD f AIR Lbvj; FIELD g DIRT Lbvj; diff --git a/mappings/net/minecraft/world/loot/LootTables.mapping b/mappings/net/minecraft/world/loot/LootTables.mapping index 56a2537e0c..3bec5779de 100644 --- a/mappings/net/minecraft/world/loot/LootTables.mapping +++ b/mappings/net/minecraft/world/loot/LootTables.mapping @@ -1,44 +1,42 @@ CLASS coi net/minecraft/world/loot/LootTables - FIELD A CHEST_JUNGLE_TEMPLE Lqs; - FIELD B DISPENSER_JUNGLE_TEMPLE Lqs; - FIELD C CHEST_IGLOO Lqs; - FIELD D CHEST_WOODLAND_MANSION Lqs; - FIELD L ENTITY_SHEEP_WHITE Lqs; - FIELD M ENTITY_SHEEP_ORANGE Lqs; - FIELD N ENTITY_SHEEP_MAGENTA Lqs; - FIELD O ENTITY_SHEEP_LIGHT_BLUE Lqs; - FIELD P ENTITY_SHEEP_YELLOW Lqs; - FIELD Q ENTITY_SHEEP_LIME Lqs; - FIELD R ENTITY_SHEEP_PINK Lqs; - FIELD S ENTITY_SHEEP_GRAY Lqs; - FIELD T ENTITY_SHEEP_LIGHT_GRAY Lqs; - FIELD U ENTITY_SHEEP_CYAN Lqs; - FIELD V ENTITY_SHEEP_PURPLE Lqs; - FIELD W ENTITY_SHEEP_BLUE Lqs; - FIELD X ENTITY_SHEEP_BROWN Lqs; - FIELD Y ENTITY_SHEEP_GREEN Lqs; - FIELD Z ENTITY_SHEEP_RED Lqs; + FIELD L WHITE_SHEEP_ENTITY Lqs; + FIELD M ORANGE_SHEEP_ENTITY Lqs; + FIELD N MAGENTA_SHEEP_ENTITY Lqs; + FIELD O LIGHT_BLUE_SHEEP_ENTITY Lqs; + FIELD P YELLOW_SHEEP_ENTITY Lqs; + FIELD Q LIME_SHEEP_ENTITY Lqs; + FIELD R PINK_SHEEP_ENTITY Lqs; + FIELD S GRAY_SHEEP_ENTITY Lqs; + FIELD T LIGHT_GRAY_SHEEP_ENTITY Lqs; + FIELD U CYAN_SHEEP_ENTITY Lqs; + FIELD V PURPLE_SHEEP_ENTITY Lqs; + FIELD W BLUE_SHEEP_ENTITY Lqs; + FIELD X BROWN_SHEEP_ENTITY Lqs; + FIELD Y GREEN_SHEEP_ENTITY Lqs; + FIELD Z RED_SHEEP_ENTITY Lqs; FIELD a EMPTY Lqs; - FIELD aa ENTITY_SHEEP_BLACK Lqs; - FIELD ab GAMEPLAY_FISHING Lqs; - FIELD ac GAMEPLAY_FISHING_JUNK Lqs; - FIELD ad GAMEPLAY_FISHING_TREASURE Lqs; - FIELD ae GAMEPLAY_FISHING_FISH Lqs; - FIELD af GAMEPLAY_CAT_MORNING_GIFT Lqs; + FIELD aa BLACK_SHEEP_ENTITY Lqs; FIELD at LOOT_TABLES Ljava/util/Set; FIELD au LOOT_TABLES_READ_ONLY Ljava/util/Set; - FIELD b CHEST_SPAWN_BONUS Lqs; - FIELD c CHEST_END_CITY_TREASURE Lqs; - FIELD d CHEST_SIMPLE_DUNGEON Lqs; - FIELD e CHEST_VILLAGE_BLACKSMITH Lqs; - FIELD u CHEST_ABANDONED_MINESHAFT Lqs; - FIELD v CHEST_NETHER_BRIDGE Lqs; - FIELD w CHEST_STRONGHOLD_LIBRARY Lqs; - FIELD x CHEST_STRONGHOLD_CROSSING Lqs; - FIELD y CHEST_STRONGHOLD_CORRIDOR Lqs; - FIELD z CHEST_DESERT_PYRAMID Lqs; + FIELD b SPAWN_BONUS_CHEST Lqs; + FIELD e VILLAGE_WEAPONSMITH_CHEST Lqs; + FIELD f VILLAGE_TOOLSMITH_CHEST Lqs; + FIELD g VILLAGE_ARMORER_CHEST Lqs; + FIELD h VILLAGE_CARTOGRAPHER_CHEST Lqs; + FIELD i VILLAGE_MASON_CHEST Lqs; + FIELD j VILLAGE_SHEPARD_CHEST Lqs; + FIELD k VILLAGE_BUTCHER_CHEST Lqs; + FIELD l VILLAGE_FLETCHER_CHEST Lqs; + FIELD m VILLAGE_FISHER_CHEST Lqs; + FIELD n VILLAGE_TANNERY_CHEST Lqs; + FIELD o VILLAGE_TEMPLE_CHEST Lqs; + FIELD p VILLAGE_DESERT_HOUSE_CHEST Lqs; + FIELD q VILLAGE_PLAINS_CHEST Lqs; + FIELD r VILLAGE_TAIGA_HOUSE_CHEST Lqs; + FIELD s VILLAGE_SNOWY_HOUSE_CHEST Lqs; + FIELD t VILLAGE_SAVANNA_HOUSE_CHEST Lqs; METHOD a getAll ()Ljava/util/Set; - METHOD a registerLootTable (Ljava/lang/String;)Lqs; + METHOD a register (Ljava/lang/String;)Lqs; ARG 0 id METHOD a registerLootTable (Lqs;)Lqs; ARG 0 id diff --git a/mappings/net/minecraft/world/loot/context/LootContext.mapping b/mappings/net/minecraft/world/loot/context/LootContext.mapping index c07885774e..ab458a33da 100644 --- a/mappings/net/minecraft/world/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContext.mapping @@ -42,10 +42,6 @@ CLASS col net/minecraft/world/loot/context/LootContext METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V ARG 1 writer ARG 2 entity - FIELD a THIS Lcol$c; - FIELD b KILLER Lcol$c; - FIELD c DIRECT_KILLER Lcol$c; - FIELD d KILLER_PLAYER Lcol$c; FIELD e type Ljava/lang/String; FIELD f identifier Lcqk; METHOD (Ljava/lang/String;ILjava/lang/String;Lcqk;)V diff --git a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping index 50f5b91d70..13649ca047 100644 --- a/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/world/loot/context/LootContextTypes.mapping @@ -1,12 +1,4 @@ CLASS cqm net/minecraft/world/loot/context/LootContextTypes - FIELD a EMPTY Lcql; - FIELD b CHEST Lcql; - FIELD c FISHING Lcql; - FIELD d ENTITY Lcql; - FIELD e GIFT Lcql; - FIELD f ADVANCEMENT_REWARD Lcql; - FIELD g GENERIC Lcql; - FIELD h BLOCK Lcql; FIELD i MAP Lcom/google/common/collect/BiMap; METHOD a (Lcql$a;)V ARG 0 builder diff --git a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping index 1e07d2d550..70d73ec98e 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping @@ -1,9 +1,5 @@ CLASS cpm net/minecraft/world/loot/function/CopyNameLootFunction CLASS cpm$a Source - FIELD a THIS Lcpm$a; - FIELD b KILLER Lcpm$a; - FIELD c KILLER_PLAYER Lcpm$a; - FIELD d BLOCK_ENTITY Lcpm$a; FIELD e name Ljava/lang/String; FIELD f parameter Lcqk; METHOD (Ljava/lang/String;ILjava/lang/String;Lcqk;)V