diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2aac7b2a8c..db3f9c40c1 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -33,13 +33,14 @@ CLASS cva net/minecraft/client/MinecraftClient FIELD aJ bakedModelManager Ldvp; FIELD aK blockRenderManager Ldkt; FIELD aL paintingManager Lduo; + FIELD aM statusEffectSpriteManager Ldun; FIELD aN toastManager Lcxl; FIELD aO game Lcuv; FIELD aP isRunning Z FIELD aQ nextDebugInfoUpdateTime J FIELD aR fpsCounter I FIELD aS tutorialManager Ldxv; - FIELD aT isWindowFocused Z + FIELD aT windowFocused Z FIELD aU renderTaskQueue Ljava/util/Queue; FIELD aV resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD aW openProfilerSection Ljava/lang/String; @@ -134,6 +135,7 @@ CLASS cva net/minecraft/client/MinecraftClient METHOD a openScreen (Lczi;)V ARG 1 screen METHOD a setCrashReport (Ld;)V + METHOD a joinWorld (Ldhc;)V METHOD a setCurrentServerEntry (Ldhf;)V METHOD a getSearchableContainer (Ldwt$a;)Ldwq; ARG 1 key @@ -164,17 +166,22 @@ CLASS cva net/minecraft/client/MinecraftClient METHOD am getBakedModelManager ()Ldvp; METHOD an getFontManager ()Lcxp; METHOD ao getPaintingManager ()Lduo; + METHOD ap getStatusEffectSpriteManager ()Ldun; METHOD aq getProfiler ()Lagc; METHOD ar getGame ()Lcuv; METHOD at getSplashTextLoader ()Lduq; + METHOD au getOverlay ()Lczd; METHOD av init ()V METHOD ay initializeSearchableContainers ()V METHOD az checkIs64Bit ()Z METHOD b start ()V + METHOD b disconnect (Lczi;)V + ARG 1 screen METHOD b populateCrashReport (Ld;)Ld; ARG 1 report METHOD b setWorld (Ldhc;)V METHOD c getFramebuffer ()Lctf; + METHOD c reset (Lczi;)V METHOD c printCrashReport (Ld;)V METHOD c setConnectedToRealms (Z)V ARG 1 connectedToRealms @@ -191,7 +198,7 @@ CLASS cva net/minecraft/client/MinecraftClient METHOD l openPauseMenu ()V METHOD m getMusicTracker ()Ldxg; METHOD n tick ()V - METHOD o openWorkingScreen ()V + METHOD o disconnect ()V METHOD q isDemo ()Z METHOD r getNetworkHandler ()Ldgz; METHOD s isHudEnabled ()Z diff --git a/mappings/net/minecraft/client/gl/PostProcessShader.mapping b/mappings/net/minecraft/client/gl/PostProcessShader.mapping index d7f041e1da..f06aa5b19a 100644 --- a/mappings/net/minecraft/client/gl/PostProcessShader.mapping +++ b/mappings/net/minecraft/client/gl/PostProcessShader.mapping @@ -22,3 +22,4 @@ CLASS dkj net/minecraft/client/gl/PostProcessShader ARG 3 width ARG 4 height METHOD b getProgram ()Ldjv; + METHOD c setGlState ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4aef5b7c33..a965a20ee9 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -26,6 +26,7 @@ CLASS dgz net/minecraft/client/network/ClientPlayNetworkHandler METHOD a sendResourcePackStatus (Lou$a;)V METHOD b getCommandSource ()Ldha; METHOD b validateResourcePackUrl (Ljava/lang/String;)Z + METHOD c clearWorld ()V METHOD d getRecipeManager ()Lbed; METHOD e getScoreboardEntries ()Ljava/util/Collection; METHOD f getProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/client/options/CloudRenderMode.mapping b/mappings/net/minecraft/client/options/CloudRenderMode.mapping index 4c5164f722..34836eb233 100644 --- a/mappings/net/minecraft/client/options/CloudRenderMode.mapping +++ b/mappings/net/minecraft/client/options/CloudRenderMode.mapping @@ -1,5 +1,8 @@ CLASS cus net/minecraft/client/options/CloudRenderMode + FIELD d RENDER_MODES [Lcus; FIELD e renderModeId I FIELD f renderMode Ljava/lang/String; METHOD a getRenderModeId ()I + METHOD a fromId (I)Lcus; + ARG 0 id METHOD b getRenderMode ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 4df4a37a57..de22414c11 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -96,6 +96,9 @@ CLASS cve net/minecraft/client/options/GameOptions FIELD z useNativeTransport Z METHOD a load ()V METHOD a getTextBackgroundOpacity (F)F + ARG 1 fallback + METHOD a getTextBackgroundColor (I)I + ARG 1 fallbackColor METHOD a togglePlayerModelPart (Lavs;)V METHOD a setPlayerModelPart (Lavs;Z)V ARG 1 part @@ -107,6 +110,8 @@ CLASS cve net/minecraft/client/options/GameOptions METHOD a setSoundVolume (Lyk;F)V ARG 1 category METHOD b write ()V + METHOD b getTextBackgroundColor (F)I + ARG 1 fallbackOpacity METHOD c onPlayerModelPartChange ()V METHOD d getEnabledPlayerModelParts ()Ljava/util/Set; METHOD e getCloudRenderMode ()Lcus; diff --git a/mappings/net/minecraft/client/options/KeyBinding.mapping b/mappings/net/minecraft/client/options/KeyBinding.mapping index cc8f2c4e1d..857acbc49e 100644 --- a/mappings/net/minecraft/client/options/KeyBinding.mapping +++ b/mappings/net/minecraft/client/options/KeyBinding.mapping @@ -29,6 +29,8 @@ CLASS cuy net/minecraft/client/options/KeyBinding METHOD a setKeyPressed (Lctk$a;Z)V ARG 0 key ARG 1 pressed + METHOD a getLocalizedName (Ljava/lang/String;)Ljava/util/function/Supplier; + ARG 0 id METHOD b unpressAll ()V METHOD b setKeyCode (Lctk$a;)V METHOD b equals (Lcuy;)Z diff --git a/mappings/net/minecraft/client/particle/AnimatedParticle.mapping b/mappings/net/minecraft/client/particle/AnimatedParticle.mapping index 86b5bea0dd..bbd73ee702 100644 --- a/mappings/net/minecraft/client/particle/AnimatedParticle.mapping +++ b/mappings/net/minecraft/client/particle/AnimatedParticle.mapping @@ -1,4 +1,7 @@ CLASS dir net/minecraft/client/particle/AnimatedParticle + FIELD C spriteProvider Ldix; + FIELD F upwardsAcceleration F + FIELD G resistance F FIELD H targetColorRed F FIELD I targetColorGreen F FIELD J targetColorBlue F @@ -8,5 +11,9 @@ CLASS dir net/minecraft/client/particle/AnimatedParticle ARG 2 x ARG 4 y ARG 6 z + ARG 8 spriteProvider + ARG 9 upwardsAcceleration METHOD b setColor (I)V METHOD c setTargetColor (I)V + METHOD g setResistance (F)V + ARG 1 resistance diff --git a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping index 50261d8ac9..d1f56e5cf2 100644 --- a/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockLeakParticle.mapping @@ -1,3 +1,53 @@ CLASS dht net/minecraft/client/particle/BlockLeakParticle - CLASS dht$f LavaFactory - CLASS dht$h WaterFactory + CLASS dht$f DrippingLavaFactory + FIELD a spriteProvider Ldix; + METHOD (Ldix;)V + ARG 1 spriteProvider + CLASS dht$h FallingWaterFactory + FIELD a spriteProvider Ldix; + METHOD (Ldix;)V + ARG 1 spriteProvider + CLASS dht$a DrippingLavaParticle + METHOD (Lbha;DDDLckr;Lgd;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 fluid + ARG 9 nextParticle + CLASS dht$b FallingParticle + FIELD C nextParticle Lgd; + METHOD (Lbha;DDDLckr;Lgd;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 fluid + ARG 9 nextParticle + CLASS dht$c DrippingParticle + FIELD C nextParticle Lgd; + METHOD (Lbha;DDDLckr;Lgd;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 fluid + ARG 9 nextParticle + CLASS dht$d LandingParticle + CLASS dht$e FallingLavaFactory + FIELD a spriteProvider Ldix; + METHOD (Ldix;)V + ARG 1 spriteProvider + CLASS dht$g LandingLavaFactory + FIELD a spriteProvider Ldix; + CLASS dht$i DrippingWaterFactory + FIELD a spriteProvider Ldix; + FIELD C fluid Lckr; + METHOD (Lbha;DDDLckr;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 fluid + METHOD g updateAge ()V + METHOD h updateVelocity ()V diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index 484f36c0f0..782a0fc8d2 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,10 +1,13 @@ CLASS dhz net/minecraft/client/particle/FireworksSparkParticle - CLASS dhz$b + CLASS dhz$b FlashParticle METHOD (Lbha;DDD)V ARG 1 x ARG 2 y - CLASS dhz$d Factory - CLASS dhz$e create + CLASS dhz$d ExplosionFactory + FIELD a spriteProvider Ldix; + METHOD (Ldix;)V + ARG 1 spriteProvider + CLASS dhz$e FireworkParticle FIELD C age I FIELD D particleManager Ldim; FIELD E explosions Lii; @@ -18,3 +21,49 @@ CLASS dhz net/minecraft/client/particle/FireworksSparkParticle ARG 12 velocityZ ARG 14 particleManager ARG 15 tag + METHOD a addExplosionParticle (DDDDDD[I[IZZ)V + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 velocityX + ARG 9 velocityY + ARG 11 velocityZ + ARG 13 colors + ARG 14 fadeColors + ARG 15 trail + ARG 16 flicker + METHOD a explodeBall (DI[I[IZZ)V + ARG 1 size + ARG 3 amount + ARG 4 colors + ARG 5 fadeColors + ARG 6 trail + ARG 7 flicker + METHOD a explodeStar (D[[D[I[IZZZ)V + ARG 1 size + ARG 3 pattern + ARG 4 colors + ARG 5 fadeColors + ARG 6 trail + ARG 7 flicker + ARG 8 keepShape + METHOD a explodeBurst ([I[IZZ)V + ARG 1 colors + ARG 2 fadeColors + ARG 3 trail + ARG 4 flocker + METHOD c isFar ()Z + CLASS dhz$a FlashFactory + FIELD a spriteProvider Ldix; + CLASS dhz$c ExplosionParticle + FIELD F trail Z + FIELD G flicker Z + FIELD H particleManager Ldim; + METHOD (Lbha;DDDDDDLdim;Ldix;)V + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + METHOD a setTrail (Z)V + ARG 1 trail + METHOD b setFlicker (Z)V + ARG 1 flicker diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 25ba76b60b..bb61baa3d3 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -7,9 +7,9 @@ CLASS dik net/minecraft/client/particle/Particle FIELD b prevPosX D FIELD c prevPosY D FIELD d prevPosZ D - FIELD e posX D - FIELD f posY D - FIELD g posZ D + FIELD e x D + FIELD f y D + FIELD g z D FIELD h velocityX D FIELD i velocityY D FIELD j velocityZ D diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 3eb80a7d40..8a1262afce 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -6,9 +6,11 @@ CLASS dim net/minecraft/client/particle/ParticleManager FIELD f random Ljava/util/Random; FIELD g factories Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD h newParticles Ljava/util/Queue; + FIELD j particleAtlasTexture Ldtw; METHOD (Lbha;Ldty;)V ARG 1 world ARG 2 textureManager + METHOD a clearAtlas ()V METHOD a addEmitter (Laid;Lgd;)V ARG 1 entity ARG 2 parameters diff --git a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping index c876ef9261..1dcee796fc 100644 --- a/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpriteBillboardParticle.mapping @@ -1,3 +1,7 @@ CLASS djc net/minecraft/client/particle/SpriteBillboardParticle FIELD E sprite Ldtx; + METHOD a setSprite (Ldix;)V + ARG 1 spriteProvider METHOD a setSprite (Ldtx;)V + METHOD b setSpriteForAge (Ldix;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping index 0e2b78f818..62c49162cc 100644 --- a/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipe/book/ClientRecipeBook.mapping @@ -3,8 +3,12 @@ CLASS cur net/minecraft/client/recipe/book/ClientRecipeBook FIELD l resultsByGroup Ljava/util/Map; FIELD m orderedResults Ljava/util/List; METHOD a getResultsForGroup (Lcvh;)Ljava/util/List; + METHOD a addGroupResults (Lcvh;Ldbz;)V + ARG 1 group + ARG 2 results METHOD b getGroupsForContainer (Lazb;)Ljava/util/List; METHOD b addGroup (Lcvh;)Ldbz; + ARG 1 group METHOD g getGroupForRecipe (Lbec;)Lcvh; METHOD i reload ()V METHOD j getOrderedResults ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index fe2ff40b33..190985f9e5 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -93,6 +93,7 @@ CLASS djz net/minecraft/client/render/GameRenderer ARG 1 tickDelta METHOD h disableLightmap ()V METHOD i enableLightmap ()V + METHOD j reset ()V METHOD k getMapRenderer ()Lcvv; METHOD l getClient ()Lcva; METHOD m getViewDistance ()F diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index 6ac1747930..2d7eea32d9 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -5,6 +5,8 @@ CLASS duv net/minecraft/client/resource/language/LanguageManager FIELD d languageDefs Ljava/util/Map; METHOD a isRightToLeft ()Z METHOD a setLanguage (Lduu;)V + METHOD a getLanguage (Ljava/lang/String;)Lduu; + ARG 1 code METHOD a reloadResources (Ljava/util/List;)V METHOD b getLanguage ()Lduu; METHOD c getAllLanguages ()Ljava/util/SortedSet; diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping index 4e390e8934..dde2bde310 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadataReader.mapping @@ -1 +1,4 @@ CLASS dva net/minecraft/client/resource/metadata/AnimationResourceMetadataReader + METHOD a readFrameMetadata (ILcom/google/gson/JsonElement;)Lduy; + ARG 1 frame + ARG 2 json diff --git a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping b/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping index e8fdee183c..d33db65f9c 100644 --- a/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping +++ b/mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping @@ -5,4 +5,7 @@ CLASS dwr net/minecraft/client/search/IdentifierSearchableContainer FIELD c identifierFinder Ljava/util/function/Function; FIELD d entries Ljava/util/List; FIELD e entryIds Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD a compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 object1 + ARG 2 object2 METHOD b index (Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping index 62fbcca240..2f93710c0c 100644 --- a/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/sortme/PlayerSkinProvider.mapping @@ -7,6 +7,10 @@ CLASS dup net/minecraft/client/sortme/PlayerSkinProvider FIELD e skinCache Lcom/google/common/cache/LoadingCache; METHOD a getTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; ARG 1 gameProfile + METHOD a loadSkin (Lcom/mojang/authlib/GameProfile;Ldup$a;Z)V + ARG 1 profile + ARG 2 callback + ARG 3 requireSecure METHOD a loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lqs; ARG 1 profileTexture ARG 2 type diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 425e3e7a5a..e84417d0c0 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -1,7 +1,16 @@ CLASS ctp net/minecraft/client/texture/NativeImage CLASS ctp$a Format FIELD e bytesPerPixel I + FIELD f pixelDataFormat I METHOD a getBytesPerPixel ()I + METHOD b setPackAlignment ()V + METHOD c setUnpackAlignment ()V + METHOD d getPixelDataFormat ()I + METHOD g hasLuminanceOrAlpha ()Z + CLASS ctp$c WriteCallback + FIELD a channel Ljava/nio/channels/WritableByteChannel; + FIELD b exception Ljava/io/IOException; + METHOD a throwStoredException ()V FIELD a WRITE_TO_FILE_OPEN_OPTIONS Ljava/util/Set; FIELD b format Lctp$a; FIELD c width I @@ -48,8 +57,11 @@ CLASS ctp net/minecraft/client/texture/NativeImage ARG 9 clamp METHOD a resizeSubRectTo (IIIILctp;)V METHOD a upload (IIIZ)V + METHOD a loadFromTextureImage (IZ)V METHOD a fromInputStream (Lctp$a;Ljava/io/InputStream;)Lctp; METHOD a fromByteBuffer (Lctp$a;Ljava/nio/ByteBuffer;)Lctp; + METHOD a copyFrom (Lctp;)V + ARG 1 image METHOD a writeFile (Ljava/io/File;)V METHOD a fromInputStream (Ljava/io/InputStream;)Lctp; METHOD a writeFile (Ljava/lang/String;)V @@ -65,6 +77,7 @@ CLASS ctp net/minecraft/client/texture/NativeImage ARG 7 shiftX ARG 8 shiftY ARG 10 glyph + METHOD a setTextureFilter (ZZ)V METHOD b getHeight ()I METHOD b getAlphaOrLuminance (II)B ARG 1 x @@ -76,4 +89,5 @@ CLASS ctp net/minecraft/client/texture/NativeImage ARG 0 clamp METHOD c getFormat ()Lctp$a; METHOD d makePixelArray ()[I + METHOD f untrack ()V METHOD g checkAllocated ()V diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 17ad80c018..ee7f9184d0 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -2,6 +2,7 @@ CLASS dtx net/minecraft/client/texture/Sprite FIELD a width I FIELD b height I FIELD c images [Lctp; + FIELD d frameOffsets [I FIELD f interpolatedImages [Lctp; FIELD g x I FIELD h y I @@ -23,6 +24,9 @@ CLASS dtx net/minecraft/client/texture/Sprite ARG 4 second METHOD a getXFromU (F)F METHOD a generateMipmaps (I)V + METHOD a isDivisibleBy (II)Z + ARG 0 number + ARG 1 divisor METHOD a init (IIII)V ARG 1 width ARG 2 height @@ -47,8 +51,19 @@ CLASS dtx net/minecraft/client/texture/Sprite METHOD b getYFromV (F)F METHOD b generateMipmapsInternal (I)V ARG 1 mipLevels + METHOD b getDimensions (IIII)Lcom/mojang/datafixers/util/Pair; + ARG 0 animationMetadataWidth + ARG 1 animationMetadataHeight + ARG 2 width + ARG 3 height METHOD c destroy ()V METHOD c srgbToLinear (I)F + METHOD c getFramePixel (IIII)I + ARG 1 frame + ARG 3 x + ARG 4 y + METHOD d upload (I)V + ARG 1 frame METHOD g getWidth ()I METHOD h getHeight ()I METHOD i getMinU ()F @@ -57,4 +72,6 @@ CLASS dtx net/minecraft/client/texture/Sprite METHOD l getMaxV ()F METHOD m getId ()Lqs; METHOD n tick ()V + METHOD o getFrameCount ()I METHOD p isAnimated ()Z + METHOD q upload ()V diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 36408965b2..3044a01335 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -3,18 +3,22 @@ CLASS dtu net/minecraft/client/texture/TextureStitcher FIELD a sprite Ldtx; FIELD b width I FIELD c height I + METHOD (Ldtx;I)V + ARG 2 mipLevel CLASS dtu$b Slot FIELD a x I FIELD b y I FIELD c width I FIELD d height I FIELD e subSlots Ljava/util/List; - FIELD f spriteHolder Ldtu$a; - METHOD a getSpriteHolder ()Ldtu$a; + FIELD f texture Ldtu$a; + METHOD a getTexture ()Ldtu$a; METHOD a tryFit (Ldtu$a;)Z METHOD a addAllFilledSlots (Ljava/util/function/Consumer;)V METHOD b getX ()I METHOD c getY ()I + FIELD a comparator Ljava/util/Comparator; + FIELD b mipLevel I FIELD c holders Ljava/util/Set; FIELD d slots Ljava/util/List; FIELD e width I @@ -28,5 +32,8 @@ CLASS dtu net/minecraft/client/texture/TextureStitcher METHOD a tryFit (Ldtu$a;)Z METHOD a add (Ldtx;)V METHOD b getHeight ()I + METHOD b applyMipLevel (II)I + ARG 0 size + ARG 1 mipLevel METHOD c stitch ()V METHOD d getStitchedSprites ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index d2270c0a7e..3c2659c63e 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -5,10 +5,15 @@ CLASS cxl net/minecraft/client/toast/ToastManager ARG 1 instance METHOD a getInstance ()Lcxk; METHOD a draw (II)Z + METHOD a getDissapearProgress (J)F + ARG 1 time FIELD a client Lcva; FIELD b visibleEntries [Lcxl$a; FIELD c toastQueue Ljava/util/Deque; METHOD a draw ()V METHOD a add (Lcxk;)V + METHOD a getToast (Ljava/lang/Class;Ljava/lang/Object;)Lcxk; + ARG 1 toastClass + ARG 2 type METHOD b clear ()V METHOD c getGame ()Lcva; diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index b0d45b03e2..0d5c6a2ed3 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -7,4 +7,12 @@ CLASS cxm net/minecraft/client/toast/TutorialToast FIELD d title Ljava/lang/String; FIELD e description Ljava/lang/String; FIELD f visibility Lcxk$a; + FIELD g lastTime J + FIELD h lastProgress F + FIELD i progress F + FIELD j hasProgressBar Z + METHOD (Lcxm$a;Ljm;Ljm;Z)V + ARG 4 hasProgressBar METHOD a hide ()V + METHOD a setProgress (F)V + ARG 1 progress diff --git a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping index ab3e2bbc04..7ce8c1c123 100644 --- a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping @@ -4,3 +4,6 @@ CLASS dxq net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler FIELD c manager Ldxv; FIELD d toast Lcxm; FIELD e ticks I + METHOD a hasCrafted (Ldjm;Lza;)Z + ARG 0 player + ARG 1 tag diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index 84a2f3d7da..04060a1ece 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -3,4 +3,5 @@ CLASS dxr net/minecraft/client/tutorial/FindTreeTutorialStepHandler FIELD b TITLE Ljm; FIELD c DESCRIPTION Ljm; FIELD d manager Ldxv; + FIELD e toast Lcxm; FIELD f ticks I diff --git a/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping index e7b1b2ebf0..85efb4c3d9 100644 --- a/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping @@ -4,4 +4,12 @@ CLASS dxs net/minecraft/client/tutorial/MovementTutorialStepHandler FIELD c LOOK_TITLE Ljm; FIELD d LOOK_DESCRIPTION Ljm; FIELD e manager Ldxv; + FIELD f moveToast Lcxm; + FIELD g lookAroundToast Lcxm; FIELD h ticks I + FIELD i movedTicks I + FIELD j lookedAroundTicks I + FIELD k movedLastTick Z + FIELD l lookedAroundLastTick Z + FIELD m moveAroundCompletionTicks I + FIELD n lookAroundCompletionTicks I diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 47c5bda9f6..38c8970827 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -2,8 +2,16 @@ CLASS dxv net/minecraft/client/tutorial/TutorialManager FIELD a client Lcva; FIELD b currentHandler Ldxw; METHOD a onInventoryOpened ()V + METHOD a onUpdateMouse (DD)V + ARG 1 deltaX + ARG 3 deltaY METHOD a onSlotUpdate (Lbbu;)V + METHOD a tick (Ldhc;Lcrm;)V + ARG 1 world + ARG 2 hitResult METHOD a onBlockAttacked (Ldhc;Lev;Lbvc;F)V + METHOD a onMovement (Ldjk;)V + ARG 1 input METHOD a setStep (Ldxx;)V METHOD a getKeybindName (Ljava/lang/String;)Ljm; METHOD b destroyHandler ()V diff --git a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping index ba33470674..c9f6ce2e47 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStepHandler.mapping @@ -1,6 +1,14 @@ CLASS dxw net/minecraft/client/tutorial/TutorialStepHandler METHOD a tick ()V + METHOD a onMouseUpdate (DD)V + ARG 1 deltaX + ARG 3 deltaY METHOD a onSlotUpdate (Lbbu;)V + METHOD a onTarget (Ldhc;Lcrm;)V + ARG 1 world + ARG 2 hitResult METHOD a onBlockAttacked (Ldhc;Lev;Lbvc;F)V + METHOD a onMovement (Ldjk;)V + ARG 1 input METHOD b destroy ()V METHOD c onInventoryOpened ()V diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 99e0e29ef8..a3a61cc31f 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -5,12 +5,19 @@ CLASS dhc net/minecraft/client/world/ClientWorld FIELD d worldRenderer Ldkd; FIELD v client Lcva; FIELD w players Ljava/util/List; - FIELD x ticksSinceLightingClient I + FIELD x ticksUntilCaveAmbientSound I FIELD y scoreboard Lcso; FIELD z mapStates Ljava/util/Map; METHOD (Ldgz;Lbhe;Lbxw;ILagc;Ldkd;)V ARG 1 netHandler ARG 2 levelInfo + METHOD a addParticle (DDDDDLgd;)V + ARG 1 minX + ARG 3 maxX + ARG 5 minZ + ARG 7 maxZ + ARG 9 y + ARG 11 parameters METHOD a doRandomBlockDisplayTicks (III)V ARG 1 xCenter ARG 2 yCenter @@ -21,10 +28,32 @@ CLASS dhc net/minecraft/client/world/ClientWorld ARG 4 radius ARG 5 random ARG 6 spawnBarrierParticles + METHOD a addEntity (ILaid;)V + ARG 1 id + ARG 2 entity + METHOD a addPlayer (ILdjj;)V + ARG 1 id + ARG 2 player METHOD a tickEntity (Laid;)V ARG 1 entity + METHOD a tickPassenger (Laid;Laid;)V + ARG 1 entity + ARG 2 passenger + METHOD a addLightning (Latf;)V + ARG 1 lightning + METHOD a unloadBlockEntities (Lbxc;)V + ARG 1 chunk METHOD a setScoreboard (Lcso;)V ARG 1 scoreboard + METHOD a addParticle (Lev;Lbvc;Lgd;Z)V + ARG 1 pos + ARG 2 state + ARG 3 parameters + METHOD a addParticle (Lev;Lgd;Lcsi;D)V + ARG 1 pos + ARG 2 parameters + ARG 3 shape + ARG 4 y METHOD a playSound (Lev;Lyi;Lyk;FFZ)V ARG 1 pos ARG 2 sound @@ -32,4 +61,21 @@ CLASS dhc net/minecraft/client/world/ClientWorld ARG 4 volume ARG 5 pitch ARG 6 useDistance + METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD b getEntities ()Ljava/lang/Iterable; + METHOD b scheduleBlockRenders (III)V + METHOD b addEntityPrivate (ILaid;)V + ARG 1 id + ARG 2 entity + METHOD b checkChunk (Laid;)V + ARG 1 entity + METHOD b addEntitiesToChunk (Lbxc;)V + ARG 1 chunk + METHOD b setBlockStateWithoutNeighborUpdates (Lev;Lbvc;)V + METHOD d tickEntities ()V + METHOD d removeEntity (I)V + METHOD d finishRemovingEntity (Laid;)V + ARG 1 entity + METHOD f getRegularEntityCount ()I + METHOD g finishRemovingEntities ()V + METHOD j tickCaveAmbientSound ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 21b5a69d3c..fe31d963ae 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -201,7 +201,7 @@ CLASS aid net/minecraft/entity/Entity METHOD aI getSavedEntityId ()Ljava/lang/String; METHOD aJ isAlive ()Z METHOD aK isInsideWall ()Z - METHOD aL updateRiding ()V + METHOD aL tickRiding ()V METHOD aM getHeightOffset ()D METHOD aN getMountedHeightOffset ()D METHOD aO isLiving ()Z diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 76416a2ef2..cec13dcf89 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -16,6 +16,8 @@ CLASS avq net/minecraft/entity/player/PlayerInventory ARG 1 existingStack METHOD a getBlockBreakingSpeed (Lbvc;)F METHOD a serialize (Lii;)Lii; + METHOD a contains (Lza;)Z + ARG 1 tag METHOD b getSlotWithStack (Lbbu;)I METHOD b areItemsEqual (Lbbu;Lbbu;)Z ARG 1 stack1 @@ -34,7 +36,8 @@ CLASS avq net/minecraft/entity/player/PlayerInventory METHOD g getHotbarSize ()I METHOD g setCursorStack (Lbbu;)V METHOD h getEmptySlot ()I - METHOD h containsStack (Lbbu;)Z + METHOD h contains (Lbbu;)Z + ARG 1 stack METHOD i getSwappableHotbarSlot ()I METHOD i addStack (Lbbu;)I METHOD j updateItems ()V diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 6cb89bac49..6d7c29a9a8 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -2,6 +2,7 @@ CLASS bhb net/minecraft/world/IWorld METHOD E getChunkManager ()Lbwu; METHOD F getFluidTickScheduler ()Lbhp; METHOD G getBlockTickScheduler ()Lbhp; + METHOD a playLevelEvent (Lavr;ILev;I)V METHOD a playSound (Lavr;Lev;Lyi;Lyk;FF)V METHOD a updateNeighbors (Lev;Lbme;)V METHOD a addParticle (Lgd;DDDDDD)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 75bed31cf9..f9f1bf9a06 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -7,7 +7,7 @@ CLASS bha net/minecraft/world/World FIELD f blockEntities Ljava/util/List; FIELD g tickingBlockEntities Ljava/util/List; FIELD h pendingBlockEntities Ljava/util/List; - FIELD i unloadedEntities Ljava/util/List; + FIELD i unloadedBlockEntities Ljava/util/List; FIELD j lcgBlockSeed I FIELD k unusedIncrement I FIELD l rainGradientPrev F @@ -32,6 +32,7 @@ CLASS bha net/minecraft/world/World METHOD B getPendingBlockEntity (Lev;)Lbtf; METHOD D getScoreboard ()Lcso; METHOD J isDaylight ()Z + METHOD K tickBlockEntities ()V METHOD L getChunkProviderStatus ()Ljava/lang/String; METHOD M calculateAmbientDarkness ()V METHOD N initWeatherGradients ()V @@ -130,6 +131,10 @@ CLASS bha net/minecraft/world/World ARG 1 pos METHOD a setBlockState (Lev;Lbvc;)Z ARG 1 pos + METHOD a onBlockChanged (Lev;Lbvc;Lbvc;)V + ARG 1 pos + ARG 2 oldBlock + ARG 3 newBlock METHOD a updateListeners (Lev;Lbvc;Lbvc;I)V METHOD a addParticle (Lgd;ZDDDDDD)V ARG 1 parameters diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 2fa698a029..d5683b484d 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -9,7 +9,7 @@ CLASS bxc net/minecraft/world/chunk/WorldChunk FIELD g world Lbha; FIELD h heightmaps Ljava/util/Map; FIELD i upgradeData Lbxm; - FIELD j blockEntityMap Ljava/util/Map; + FIELD j blockEntities Ljava/util/Map; FIELD k entitySections [Lzf; FIELD l structureStarts Ljava/util/Map; FIELD m structureReferences Ljava/util/Map; @@ -65,5 +65,5 @@ CLASS bxc net/minecraft/world/chunk/WorldChunk METHOD u getLevelType ()Lur$b; METHOD w loadToWorld ()V METHOD x getWorld ()Lbha; - METHOD y getBlockEntityMap ()Ljava/util/Map; + METHOD y getBlockEntities ()Ljava/util/Map; METHOD z getEntitySectionArray ()[Lzf;