From 4f390a93065efa9bd1f0f6ccf023976387531958 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Thu, 14 Feb 2019 20:54:51 +0100 Subject: [PATCH] map 19w07a resource reloading (#462) --- .../blaze3d/platform/GlStateManager.mapping | 4 +-- .../client/audio/SoundLoader.mapping | 6 ++++ .../client/font/FontRendererManager.mapping | 9 ++++++ .../gui/widget/RealmsButtonWidget.mapping | 1 - .../client/particle/ParticleManager.mapping | 6 ++++ .../client/render/GameRenderer.mapping | 2 ++ .../client/render/WorldRenderer.mapping | 2 ++ .../render/block/BlockRenderManager.mapping | 2 ++ .../render/entity/FoxEntityRenderer.mapping | 5 ++++ .../entity/PaintingResourceManager.mapping | 11 ++++++++ .../WanderingTraderEntityRenderer.mapping | 2 ++ .../VillagerClothingFeatureRenderer.mapping | 2 ++ .../client/render/item/ItemRenderer.mapping | 2 ++ .../render/model/BakedModelManager.mapping | 6 ++++ .../FoliageColormapResourceLoader.mapping | 6 ++++ .../GrassColormapResourceLoader.mapping | 6 ++++ .../resource/SplashTextResourceLoader.mapping | 6 ++++ .../resource/language/LanguageManager.mapping | 2 ++ .../client/search/SearchManager.mapping | 2 ++ .../client/texture/SpriteAtlasTexture.mapping | 6 ++++ .../client/texture/TextureManager.mapping | 6 ++++ .../data/TrackedDataHandlerRegistry.mapping | 28 +++++++++---------- mappings/net/minecraft/item/ItemGroup.mapping | 18 ++++++------ .../minecraft/recipe/RecipeManager.mapping | 2 ++ .../resource/PackResourceManager.mapping | 14 ++++++++++ ...ProfilingResourceReloadHandlerImpl.mapping | 10 +++++++ .../ReloadablePackResourceManager.mapping | 11 ++++++++ .../ReloadableResourceManager.mapping | 3 +- .../net/minecraft/resource/Resource.mapping | 2 +- .../minecraft/resource/ResourceImpl.mapping | 1 + .../resource/ResourceManager.mapping | 1 + .../resource/ResourceReloadHandler.mapping | 3 ++ .../ResourceReloadHandlerImpl.mapping | 13 +++++++++ .../resource/ResourceReloadListener.mapping | 10 ++++++- .../SynchronousResourceReloadListener.mapping | 9 +++++- .../server/ServerAdvancementLoader.mapping | 2 ++ .../function/CommandFunctionManager.mapping | 2 ++ .../structure/StructureManager.mapping | 2 ++ mappings/net/minecraft/tag/TagManager.mapping | 6 ++++ .../net/minecraft/util/SystemUtil.mapping | 6 +++- .../util/profiler/EmptyProfileResult.mapping | 1 + .../util/profiler/ProfileResult.mapping | 1 + .../util/profiler/ProfileResultImpl.mapping | 1 + .../minecraft/world/loot/LootManager.mapping | 2 ++ 44 files changed, 211 insertions(+), 31 deletions(-) create mode 100644 mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/PaintingResourceManager.mapping create mode 100644 mappings/net/minecraft/client/render/entity/WanderingTraderEntityRenderer.mapping create mode 100644 mappings/net/minecraft/resource/PackResourceManager.mapping create mode 100644 mappings/net/minecraft/resource/ProfilingResourceReloadHandlerImpl.mapping create mode 100644 mappings/net/minecraft/resource/ReloadablePackResourceManager.mapping create mode 100644 mappings/net/minecraft/resource/ResourceReloadHandler.mapping create mode 100644 mappings/net/minecraft/resource/ResourceReloadHandlerImpl.mapping diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index b77b0fde4b..0eaff65587 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -1,4 +1,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager + CLASS com/mojang/blaze3d/platform/GlStateManager$DestFactor DestFactor + CLASS com/mojang/blaze3d/platform/GlStateManager$SourceFactor SourceFactor CLASS com/mojang/blaze3d/platform/GlStateManager$a AlphaTestState FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c; FIELD b func I @@ -88,8 +90,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD c y I FIELD d width I FIELD e height I - CLASS com/mojang/blaze3d/platform/GlStateManager$DestFactor DestFactor - CLASS com/mojang/blaze3d/platform/GlStateManager$SourceFactor SourceFactor METHOD alphaFunc (IF)V ARG 0 func ARG 1 ref diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 548a9407cc..805ca58ebe 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -19,6 +19,12 @@ CLASS dst net/minecraft/client/audio/SoundLoader METHOD a readSounds (Ljava/io/InputStream;)Ljava/util/Map; METHOD a get (Lqh;)Ldsu; METHOD a stopSounds (Lqh;Lxz;)V + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD a updateSoundVolume (Lxz;F)V ARG 1 category METHOD b pause ()V diff --git a/mappings/net/minecraft/client/font/FontRendererManager.mapping b/mappings/net/minecraft/client/font/FontRendererManager.mapping index 309d5eda4a..0e68aa4cc3 100644 --- a/mappings/net/minecraft/client/font/FontRendererManager.mapping +++ b/mappings/net/minecraft/client/font/FontRendererManager.mapping @@ -1,7 +1,16 @@ CLASS csv net/minecraft/client/font/FontRendererManager + CLASS csv$1 + METHOD a (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b fontRenderers Ljava/util/Map; FIELD d textureManager Ldpn; FIELD e forceUnicodeFont Z METHOD a getFontRenderer (Lqh;)Lcrb; + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD a setForceUnicodeFont (ZLjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V diff --git a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping index abee2e4b5e..a43913ef41 100644 --- a/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/RealmsButtonWidget.mapping @@ -12,7 +12,6 @@ CLASS ctl net/minecraft/client/gui/widget/RealmsButtonWidget ARG 4 y ARG 5 text ARG 6 width - METHOD a setText (Ljava/lang/String;)V METHOD b getId ()I METHOD c getEnabled ()Z METHOD c setEnabled (Z)V diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index d7859d723f..74e8602777 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -37,6 +37,12 @@ CLASS dec net/minecraft/client/particle/ParticleManager METHOD a registerFactory (Lfy;Lded;)V ARG 1 type ARG 2 factory + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD b getDebugString ()Ljava/lang/String; METHOD b updateParticle (Ldeb;)V METHOD b createParticle (Lfx;DDDDDD)Ldeb; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 6be722c1aa..d436b7cd80 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -44,6 +44,8 @@ CLASS dfr net/minecraft/client/render/GameRenderer METHOD a (Ldfv;FDDD)V ARG 2 tickDelta METHOD a loadShader (Lqh;)V + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b disableShader ()V METHOD b renderCenter (FJ)V ARG 1 tickDelta diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ce19b547e9..7672459529 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -153,6 +153,8 @@ CLASS dfv net/minecraft/client/render/WorldRenderer ARG 10 velocityX ARG 12 velocityY ARG 14 velocityY + METHOD a (Lwt;)V + ARG 1 arg1 METHOD a getRandomParticleSpawnChance (Z)I ARG 1 canSpawnOnMinimal METHOD b drawEntityOutlinesFramebuffer ()V diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index dcf708484f..b3e05ece3c 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -17,4 +17,6 @@ CLASS dgl net/minecraft/client/render/block/BlockRenderManager ARG 1 state ARG 2 pos METHOD a tesselateFluid (Les;Lbck;Lcpx;Lcgl;)Z + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b getModelRenderer ()Ldgn; diff --git a/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping new file mode 100644 index 0000000000..6a9714a52c --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping @@ -0,0 +1,5 @@ +CLASS dku net/minecraft/client/render/entity/FoxEntityRenderer + FIELD a TEXTURE Lqh; + FIELD j TEXTURE_SLEEP Lqh; + FIELD k TEXTURE_SNOW Lqh; + FIELD l TEXTURE_SNOW_SLEEP Lqh; diff --git a/mappings/net/minecraft/client/render/entity/PaintingResourceManager.mapping b/mappings/net/minecraft/client/render/entity/PaintingResourceManager.mapping new file mode 100644 index 0000000000..9737a5113f --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/PaintingResourceManager.mapping @@ -0,0 +1,11 @@ +CLASS dqc net/minecraft/client/render/entity/PaintingResourceManager + FIELD a BACK_SPRITE Lqh; + FIELD b atlas Ldpl; + METHOD a getBackSprite ()Ldpm; + METHOD a getSprite (Lapk;)Ldpm; + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 diff --git a/mappings/net/minecraft/client/render/entity/WanderingTraderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/WanderingTraderEntityRenderer.mapping new file mode 100644 index 0000000000..048716660d --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/WanderingTraderEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS dnd net/minecraft/client/render/entity/WanderingTraderEntityRenderer + FIELD a TEXTURE Lqh; diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index 9bc35dcae9..9a87656aeb 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -12,3 +12,5 @@ CLASS dna net/minecraft/client/render/entity/feature/VillagerClothingFeatureRend METHOD a findTexture (Ljava/lang/String;Lqh;)Lqh; ARG 1 keyType ARG 2 keyId + METHOD a (Lwt;)V + ARG 1 arg1 diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 2245f3d67e..d95a822c81 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -68,6 +68,8 @@ CLASS dlh net/minecraft/client/render/item/ItemRenderer METHOD a renderModel (Ldqy;ILaxt;)V METHOD a renderItemModel (Ldqy;Laxt;)V METHOD a getOverriddenModel (Ldqy;Laxt;Lbdb;Lahu;)Ldqy; + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b getModel (Laxt;)Ldqy; METHOD b renderGuiItem (Laxt;II)V ARG 1 stack diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 54c8ce4012..2f0c9e95cb 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -8,4 +8,10 @@ CLASS drc net/minecraft/client/render/model/BakedModelManager METHOD a getMissingModel ()Ldqy; METHOD a getModel (Ldrd;)Ldqy; ARG 1 id + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD b getBlockStateMaps ()Ldgk; diff --git a/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping b/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping index 90665ce7a0..384a28488a 100644 --- a/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping +++ b/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping @@ -1,2 +1,8 @@ CLASS dpy net/minecraft/client/resource/FoliageColormapResourceLoader FIELD a FOLIAGE_COLORMAP_LOC Lqh; + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 diff --git a/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping b/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping index 9ceab4b466..a937ef9ff3 100644 --- a/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping +++ b/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping @@ -1,2 +1,8 @@ CLASS dpz net/minecraft/client/resource/GrassColormapResourceLoader FIELD a GRASS_COLORMAP_LOC Lqh; + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 diff --git a/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping b/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping index 560b7fc755..a6caa229c8 100644 --- a/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping +++ b/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping @@ -3,3 +3,9 @@ CLASS dqe net/minecraft/client/resource/SplashTextResourceLoader FIELD b RANDOM Ljava/util/Random; FIELD c splashTexts Ljava/util/List; METHOD a get ()Ljava/lang/String; + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index 674e01c7e3..4768ce23e4 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -6,5 +6,7 @@ CLASS dqi net/minecraft/client/resource/language/LanguageManager METHOD a isRightToLeft ()Z METHOD a setLanguage (Ldqh;)V METHOD a reloadResources (Ljava/util/List;)V + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b getLanguage ()Ldqh; METHOD c getAllLanguages ()Ljava/util/SortedSet; diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index 445601ffc5..7905122eac 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -9,3 +9,5 @@ CLASS dsf net/minecraft/client/search/SearchManager METHOD a put (Ldsf$a;Ldsc;)V ARG 1 key ARG 2 value + METHOD a (Lwt;)V + ARG 1 arg1 diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 78d8051787..4821573067 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -1,17 +1,23 @@ CLASS dpl net/minecraft/client/texture/SpriteAtlasTexture + CLASS dpl$a Data FIELD f BLOCK_ATLAS_TEX Lqh; + FIELD g PARTICLE_ATLAS_TEX Lqh; + FIELD h PAINTING_ATLAS_TEX Lqh; FIELD i LOGGER Lorg/apache/logging/log4j/Logger; FIELD j animatedSprites Ljava/util/List; FIELD k spritesToLoad Ljava/util/Set; FIELD l sprites Ljava/util/Map; FIELD m pathPrefix Ljava/lang/String; + FIELD n maxTextureSize I FIELD o mipLevel I FIELD p missingSprite Ldpm; METHOD a updateAnimatedSprites ()V METHOD a setMipLevel (I)V + METHOD a upload (Ldpl$a;)V METHOD a getSprite (Ljava/lang/String;)Ldpm; METHOD a getSprite (Lqh;)Ldpm; METHOD a loadSprite (Lwt;Ldpm;)Z ARG 1 container + METHOD a stitch (Lwt;Ljava/lang/Iterable;Lafm;)Ldpl$a; METHOD b getTexturePath (Lqh;)Lqh; METHOD g clear ()V diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 0af450cc8a..3c9ee75030 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -11,5 +11,11 @@ CLASS dpn net/minecraft/client/texture/TextureManager ARG 1 id METHOD a registerTextureUpdateable (Lqh;Ldpq;)Z ARG 1 id + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD b getTexture (Lqh;)Ldpo; METHOD c destroyTexture (Lqh;)V diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 04bc0c6f61..cdfd1bf556 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -1,20 +1,6 @@ CLASS py net/minecraft/entity/data/TrackedDataHandlerRegistry CLASS py$1 METHOD b read (Liw;)Ljava/lang/Byte; - CLASS py$2 - METHOD b read (Liw;)Lfx; - CLASS py$3 - METHOD b read (Liw;)Lfi; - CLASS py$4 - METHOD b read (Liw;)Les; - CLASS py$5 - METHOD b read (Liw;)Ljava/util/Optional; - CLASS py$6 - METHOD b read (Liw;)Lew; - CLASS py$7 - METHOD b read (Liw;)Ljava/util/Optional; - CLASS py$8 - METHOD b read (Liw;)Lhv; CLASS py$11 METHOD b read (Liw;)Ljava/lang/Integer; CLASS py$12 @@ -31,6 +17,20 @@ CLASS py net/minecraft/entity/data/TrackedDataHandlerRegistry METHOD b read (Liw;)Ljava/util/Optional; CLASS py$18 METHOD b read (Liw;)Ljava/lang/Boolean; + CLASS py$2 + METHOD b read (Liw;)Lfx; + CLASS py$3 + METHOD b read (Liw;)Lfi; + CLASS py$4 + METHOD b read (Liw;)Les; + CLASS py$5 + METHOD b read (Liw;)Ljava/util/Optional; + CLASS py$6 + METHOD b read (Liw;)Lew; + CLASS py$7 + METHOD b read (Liw;)Ljava/util/Optional; + CLASS py$8 + METHOD b read (Liw;)Lhv; FIELD a BYTE Lpx; FIELD b INTEGER Lpx; FIELD c FLOAT Lpx; diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index b168e63a6e..3734b85cc5 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -2,6 +2,15 @@ CLASS awk net/minecraft/item/ItemGroup CLASS awk$1 METHOD (ILjava/lang/String;)V ARG 1 unlocalizedName + CLASS awk$10 + METHOD (ILjava/lang/String;)V + ARG 1 unlocalizedName + CLASS awk$11 + METHOD (ILjava/lang/String;)V + ARG 1 unlocalizedName + CLASS awk$12 + METHOD (ILjava/lang/String;)V + ARG 1 unlocalizedName CLASS awk$2 METHOD (ILjava/lang/String;)V ARG 1 unlocalizedName @@ -26,15 +35,6 @@ CLASS awk net/minecraft/item/ItemGroup CLASS awk$9 METHOD (ILjava/lang/String;)V ARG 1 unlocalizedName - CLASS awk$10 - METHOD (ILjava/lang/String;)V - ARG 1 unlocalizedName - CLASS awk$11 - METHOD (ILjava/lang/String;)V - ARG 1 unlocalizedName - CLASS awk$12 - METHOD (ILjava/lang/String;)V - ARG 1 unlocalizedName FIELD a GROUPS [Lawk; FIELD b BUILDING_BLOCKS Lawk; FIELD c DECORATIONS Lawk; diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index a9f4ec0fa7..b215b4203f 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -10,6 +10,8 @@ CLASS bae net/minecraft/recipe/RecipeManager METHOD a deserialize (Lqh;Lcom/google/gson/JsonObject;)Lbad; ARG 0 id ARG 1 json + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b values ()Ljava/util/Collection; METHOD c keys ()Ljava/util/stream/Stream; METHOD d clear ()V diff --git a/mappings/net/minecraft/resource/PackResourceManager.mapping b/mappings/net/minecraft/resource/PackResourceManager.mapping new file mode 100644 index 0000000000..d5f4bf05ef --- /dev/null +++ b/mappings/net/minecraft/resource/PackResourceManager.mapping @@ -0,0 +1,14 @@ +CLASS wn net/minecraft/resource/PackResourceManager + CLASS wn$a DebugInputStream + FIELD a parent Ljava/io/InputStream; + FIELD b leakMessage Ljava/lang/String; + FIELD c closed Z + FIELD a packList Ljava/util/List; + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c type Lvx; + METHOD a open (Lqh;Lvw;)Ljava/io/InputStream; + METHOD a add (Lvw;)V + METHOD b (Lqh;)Z + METHOD d getMetadataPath (Lqh;)Lqh; + METHOD e validate (Lqh;)V + METHOD f isPathAbsolute (Lqh;)Z diff --git a/mappings/net/minecraft/resource/ProfilingResourceReloadHandlerImpl.mapping b/mappings/net/minecraft/resource/ProfilingResourceReloadHandlerImpl.mapping new file mode 100644 index 0000000000..bf4edb1969 --- /dev/null +++ b/mappings/net/minecraft/resource/ProfilingResourceReloadHandlerImpl.mapping @@ -0,0 +1,10 @@ +CLASS wp net/minecraft/resource/ProfilingResourceReloadHandlerImpl + CLASS wp$a ProfilingInformation + FIELD a name Ljava/lang/String; + FIELD b prepareProfile Lafl; + FIELD c applyProfile Lafl; + FIELD d prepareTimeMs Ljava/util/concurrent/atomic/AtomicLong; + FIELD e applyTimeMs Ljava/util/concurrent/atomic/AtomicLong; + FIELD d LOGGER Lorg/apache/logging/log4j/Logger; + FIELD e reloadTimer Lcom/google/common/base/Stopwatch; + METHOD a finish (Ljava/util/List;)V diff --git a/mappings/net/minecraft/resource/ReloadablePackResourceManager.mapping b/mappings/net/minecraft/resource/ReloadablePackResourceManager.mapping new file mode 100644 index 0000000000..13ea5d5ff9 --- /dev/null +++ b/mappings/net/minecraft/resource/ReloadablePackResourceManager.mapping @@ -0,0 +1,11 @@ +CLASS ww net/minecraft/resource/ReloadablePackResourceManager + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b namespaceManagers Ljava/util/Map; + FIELD e namespaces Ljava/util/Set; + FIELD f type Lvx; + METHOD a (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lwq; + METHOD a load (Lvw;)V + METHOD a (Lwo;)V + METHOD b clear ()V + METHOD b createReloadManager (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lwq; + METHOD b (Lqh;)Z diff --git a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping index d0fc03f80b..e5da19923d 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManager.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManager.mapping @@ -1,3 +1,4 @@ CLASS wr net/minecraft/resource/ReloadableResourceManager METHOD a reload (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; - METHOD a addListener (Lwo;)V + METHOD a createReloadHandler (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lwq; + METHOD a registerListener (Lwo;)V diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index ab2f5fdde2..52351e0a34 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -2,4 +2,4 @@ CLASS ws net/minecraft/resource/Resource METHOD a getId ()Lqh; METHOD a getMetadata (Lwa;)Ljava/lang/Object; METHOD b getInputStream ()Ljava/io/InputStream; - METHOD d getPackName ()Ljava/lang/String; + METHOD d getResourcePackName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/ResourceImpl.mapping b/mappings/net/minecraft/resource/ResourceImpl.mapping index 023e64b08e..ed78fc4f2a 100644 --- a/mappings/net/minecraft/resource/ResourceImpl.mapping +++ b/mappings/net/minecraft/resource/ResourceImpl.mapping @@ -7,5 +7,6 @@ CLASS wx net/minecraft/resource/ResourceImpl FIELD f metadataInputStream Ljava/io/InputStream; FIELD g readMetadata Z FIELD h metadata Lcom/google/gson/JsonObject; + METHOD d ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping index 646385670f..47c7173786 100644 --- a/mappings/net/minecraft/resource/ResourceManager.mapping +++ b/mappings/net/minecraft/resource/ResourceManager.mapping @@ -3,4 +3,5 @@ CLASS wt net/minecraft/resource/ResourceManager METHOD a findResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Collection; ARG 1 namespace METHOD a getResource (Lqh;)Lws; + METHOD b containsResource (Lqh;)Z METHOD c getAllResources (Lqh;)Ljava/util/List; diff --git a/mappings/net/minecraft/resource/ResourceReloadHandler.mapping b/mappings/net/minecraft/resource/ResourceReloadHandler.mapping new file mode 100644 index 0000000000..bb515402b5 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceReloadHandler.mapping @@ -0,0 +1,3 @@ +CLASS wq net/minecraft/resource/ResourceReloadHandler + METHOD a whenComplete ()Ljava/util/concurrent/CompletableFuture; + METHOD b getProgress ()F diff --git a/mappings/net/minecraft/resource/ResourceReloadHandlerImpl.mapping b/mappings/net/minecraft/resource/ResourceReloadHandlerImpl.mapping new file mode 100644 index 0000000000..8b032d69d7 --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceReloadHandlerImpl.mapping @@ -0,0 +1,13 @@ +CLASS wv net/minecraft/resource/ResourceReloadHandlerImpl + CLASS wv$1 + METHOD a (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + FIELD a resourceManager Lwt; + FIELD b allLoadedFuture Ljava/util/concurrent/CompletableFuture; + FIELD c completionFuture Ljava/util/concurrent/CompletableFuture; + FIELD d loadingLoaders Ljava/util/Set; + FIELD e listenerCount I + METHOD (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lwt;Ljava/util/List;Lwv$a;Ljava/util/concurrent/CompletableFuture;)V + ARG 4 listeners + METHOD a ()Ljava/util/concurrent/CompletableFuture; + METHOD a create (Lwt;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;)Lwv; diff --git a/mappings/net/minecraft/resource/ResourceReloadListener.mapping b/mappings/net/minecraft/resource/ResourceReloadListener.mapping index 12c83f45d8..69bd5c3919 100644 --- a/mappings/net/minecraft/resource/ResourceReloadListener.mapping +++ b/mappings/net/minecraft/resource/ResourceReloadListener.mapping @@ -1,2 +1,10 @@ CLASS wo net/minecraft/resource/ResourceReloadListener - METHOD a prepare (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + CLASS wo$a Helper + METHOD a waitForAll (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; + ARG 1 passedObject + METHOD a apply (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 helper + ARG 3 prepareProfiler + ARG 4 applyProfiler + ARG 5 prepareExecutor + ARG 6 applyExecutor diff --git a/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping b/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping index 9749034e62..c21296d28a 100644 --- a/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping +++ b/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping @@ -1,2 +1,9 @@ CLASS wu net/minecraft/resource/SynchronousResourceReloadListener - METHOD a reloadResources (Lwt;)V + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 + METHOD a apply (Lwt;)V + ARG 1 manager diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 02df6522a7..51ba454af2 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -6,5 +6,7 @@ CLASS qs net/minecraft/server/ServerAdvancementLoader FIELD e MANAGER Lo; FIELD f errored Z METHOD a get (Lqh;)Ln; + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b getAdvancements ()Ljava/util/Collection; METHOD b scanAdvancements (Lwt;)Ljava/util/Map; diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 0619741c4a..757cbd2324 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -20,6 +20,8 @@ CLASS qt net/minecraft/server/function/CommandFunctionManager ARG 1 function ARG 2 exception METHOD a getFunction (Lqh;)Ljava/util/Optional; + METHOD a (Lwt;)V + ARG 1 arg1 METHOD a readLines (Lwt;Lqh;)Ljava/util/List; METHOD b getMaxCommandChainLength ()I METHOD c getFunctions ()Ljava/util/Map; diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 17ad0c775c..acb9f08ca4 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -13,6 +13,8 @@ CLASS ceq net/minecraft/structure/StructureManager METHOD a getStructurePath (Lqh;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id ARG 2 string + METHOD a (Lwt;)V + ARG 1 arg1 METHOD b getStructure (Lqh;)Lceu; METHOD b getAndCheckStructurePath (Lqh;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping index 2169c01c49..4e6ad0248f 100644 --- a/mappings/net/minecraft/tag/TagManager.mapping +++ b/mappings/net/minecraft/tag/TagManager.mapping @@ -6,6 +6,12 @@ CLASS yr net/minecraft/tag/TagManager METHOD a blocks ()Lyo; METHOD a toPacket (Liw;)V ARG 1 buf + METHOD a (Lwo$a;Lwt;Lafm;Lafm;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 arg1 + ARG 3 arg3 + ARG 4 arg4 + ARG 5 arg5 + ARG 6 arg6 METHOD b items ()Lyo; METHOD b fromPacket (Liw;)Lyr; ARG 0 buf diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index 89f844f1f9..fb61b4f235 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -13,6 +13,7 @@ CLASS m net/minecraft/util/SystemUtil METHOD a open (Ljava/net/URL;)V METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; FIELD a nanoTimeSupplier Ljava/util/function/LongSupplier; + FIELD c SERVER_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD d LOGGER Lorg/apache/logging/log4j/Logger; FIELD e ILLEGAL_FILE_NAME_PATTERN Ljava/util/regex/Pattern; METHOD a toMap ()Ljava/util/stream/Collector; @@ -21,15 +22,18 @@ CLASS m net/minecraft/util/SystemUtil METHOD a createTranslationKey (Ljava/lang/String;Lqh;)Ljava/lang/String; ARG 0 type ARG 1 id + METHOD a isPathNormalized (Ljava/nio/file/Path;)Z METHOD a get (Ljava/util/function/Supplier;)Ljava/lang/Object; ARG 0 supplier METHOD b getMeasuringTimeMs ()J - METHOD b isPathIllegal (Ljava/nio/file/Path;)Z + METHOD b isPathLegal (Ljava/nio/file/Path;)Z METHOD b thenCombine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures METHOD c getMeasuringTimeNano ()J METHOD d getEpochTimeMs ()J + METHOD e getServerWorkerExecutor ()Ljava/util/concurrent/Executor; METHOD g getOperatingSystem ()Lm$b; METHOD h getJVMFlags ()Ljava/util/stream/Stream; METHOD i identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; METHOD j getLogger ()Lorg/apache/logging/log4j/Logger; + METHOD k createServerWorkerExecutor ()Ljava/util/concurrent/ExecutorService; diff --git a/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping b/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping index 63b5981a9a..69ddc46b65 100644 --- a/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping +++ b/mappings/net/minecraft/util/profiler/EmptyProfileResult.mapping @@ -1,2 +1,3 @@ CLASS afg net/minecraft/util/profiler/EmptyProfileResult FIELD a INSTANCE Lafg; + METHOD e ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/profiler/ProfileResult.mapping b/mappings/net/minecraft/util/profiler/ProfileResult.mapping index 9f68b479c9..72855d5adf 100644 --- a/mappings/net/minecraft/util/profiler/ProfileResult.mapping +++ b/mappings/net/minecraft/util/profiler/ProfileResult.mapping @@ -6,5 +6,6 @@ CLASS afl net/minecraft/util/profiler/ProfileResult METHOD b getStartTick ()I METHOD c getEndTime ()J METHOD d getEndTick ()I + METHOD e getTimingTreeString ()Ljava/lang/String; METHOD f getTimeSpan ()J METHOD g getTickSpan ()I diff --git a/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping index 4ed5c01957..f290812e2a 100644 --- a/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping +++ b/mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping @@ -18,4 +18,5 @@ CLASS afh net/minecraft/util/profiler/ProfileResultImpl METHOD a asString (JI)Ljava/lang/String; ARG 1 timeSpan ARG 3 tickSpan + METHOD e ()Ljava/lang/String; METHOD h generateWittyComment ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/loot/LootManager.mapping b/mappings/net/minecraft/world/loot/LootManager.mapping index c0bed85557..ccf6c36ee5 100644 --- a/mappings/net/minecraft/world/loot/LootManager.mapping +++ b/mappings/net/minecraft/world/loot/LootManager.mapping @@ -9,3 +9,5 @@ CLASS ckc net/minecraft/world/loot/LootManager METHOD a toJson (Lcka;)Lcom/google/gson/JsonElement; METHOD a check (Lckb;Lqh;Lcka;Ljava/util/function/Function;)V METHOD a getSupplier (Lqh;)Lcka; + METHOD a (Lwt;)V + ARG 1 arg1