From 88671d22d734f8b1dd77fb36368b89a452945aac Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Wed, 6 Feb 2019 21:33:19 +0100 Subject: [PATCH] map basic resource stuff --- mappings/net/minecraft/client/audio/SoundLoader.mapping | 2 ++ .../net/minecraft/client/font/FontRendererManager.mapping | 2 ++ .../net/minecraft/client/particle/ParticleManager.mapping | 2 ++ .../client/render/model/BakedModelManager.mapping | 2 ++ .../client/resource/FoliageColormapResourceLoader.mapping | 2 ++ .../client/resource/GrassColormapResourceLoader.mapping | 2 ++ .../client/resource/SplashTextResourceLoader.mapping | 7 +++++++ .../net/minecraft/client/texture/MissingSprite.mapping | 4 +++- .../net/minecraft/client/texture/TextureManager.mapping | 2 ++ .../net/minecraft/resource/ResourceReloadListener.mapping | 2 ++ .../net/minecraft/resource/ResourceReloadStatus.mapping | 1 + .../resource/SynchronousResourceReloadListener.mapping | 3 +++ mappings/net/minecraft/tag/TagContainer.mapping | 3 ++- mappings/net/minecraft/tag/TagManager.mapping | 2 ++ mappings/wt.mapping | 2 ++ 15 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping create mode 100644 mappings/net/minecraft/resource/ResourceReloadStatus.mapping create mode 100644 mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping create mode 100644 mappings/wt.mapping diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index 189b1d726c..de95db6c72 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -19,6 +19,8 @@ CLASS dsj net/minecraft/client/audio/SoundLoader METHOD a readSounds (Ljava/io/InputStream;)Ljava/util/Map; METHOD a get (Lqd;)Ldsk; METHOD a stopSounds (Lqd;Lxx;)V + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD a updateSoundVolume (Lxx;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 5c83f79cf8..c371c2da49 100644 --- a/mappings/net/minecraft/client/font/FontRendererManager.mapping +++ b/mappings/net/minecraft/client/font/FontRendererManager.mapping @@ -4,4 +4,6 @@ CLASS csp net/minecraft/client/font/FontRendererManager FIELD c textureManager Ldpe; FIELD d forceUnicodeFont Z METHOD a getFontRenderer (Lqd;)Lcqu; + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD a setForceUnicodeFont (Z)V diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 7deb8e3abd..ea9d0bea13 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -37,6 +37,8 @@ CLASS ddv net/minecraft/client/particle/ParticleManager METHOD a registerFactory (Lfu;Lddw;)V ARG 1 type ARG 2 factory + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD b getDebugString ()Ljava/lang/String; METHOD b updateParticle (Lddu;)V METHOD b createParticle (Lft;DDDDDD)Lddu; diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 1d9672d1b2..dcadfd00ab 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -8,4 +8,6 @@ CLASS dqs net/minecraft/client/render/model/BakedModelManager METHOD a getMissingModel ()Ldqo; METHOD a getModel (Ldqt;)Ldqo; ARG 1 id + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD b getBlockStateMaps ()Ldgd; diff --git a/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping b/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping index 2d525c21a1..2cb6389c76 100644 --- a/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping +++ b/mappings/net/minecraft/client/resource/FoliageColormapResourceLoader.mapping @@ -1,2 +1,4 @@ CLASS dpp net/minecraft/client/resource/FoliageColormapResourceLoader FIELD a FOLIAGE_COLORMAP_LOC Lqd; + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V diff --git a/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping b/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping index 5d4884d20d..be526d132b 100644 --- a/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping +++ b/mappings/net/minecraft/client/resource/GrassColormapResourceLoader.mapping @@ -1,2 +1,4 @@ CLASS dpq net/minecraft/client/resource/GrassColormapResourceLoader FIELD a GRASS_COLORMAP_LOC Lqd; + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V diff --git a/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping b/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping new file mode 100644 index 0000000000..e61b622468 --- /dev/null +++ b/mappings/net/minecraft/client/resource/SplashTextResourceLoader.mapping @@ -0,0 +1,7 @@ +CLASS dpu net/minecraft/client/resource/SplashTextResourceLoader + FIELD a RESOURCE_ID Lqd; + FIELD b RANDOM Ljava/util/Random; + FIELD c splashTexts Ljava/util/List; + METHOD a get ()Ljava/lang/String; + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V diff --git a/mappings/net/minecraft/client/texture/MissingSprite.mapping b/mappings/net/minecraft/client/texture/MissingSprite.mapping index 1a1b037021..f9003726a3 100644 --- a/mappings/net/minecraft/client/texture/MissingSprite.mapping +++ b/mappings/net/minecraft/client/texture/MissingSprite.mapping @@ -1,5 +1,7 @@ CLASS dox net/minecraft/client/texture/MissingSprite FIELD l MISSINGNO Lqd; + FIELD m TEXTURE Ldot; FIELD n IMAGE Lzc; METHOD a getMissingSprite ()Ldox; - METHOD b getMissingTextureId ()Lqd; + METHOD b getMissingSpriteId ()Lqd; + METHOD d getMissingSpriteTexture ()Ldot; diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 2491c0859c..2b0456febb 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -11,5 +11,7 @@ CLASS dpe net/minecraft/client/texture/TextureManager ARG 1 id METHOD a registerTextureUpdateable (Lqd;Ldph;)Z ARG 1 id + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD b getTexture (Lqd;)Ldpf; METHOD d destroyTexture (Lqd;)V diff --git a/mappings/net/minecraft/resource/ResourceReloadListener.mapping b/mappings/net/minecraft/resource/ResourceReloadListener.mapping index 900829680d..40dbd27bbf 100644 --- a/mappings/net/minecraft/resource/ResourceReloadListener.mapping +++ b/mappings/net/minecraft/resource/ResourceReloadListener.mapping @@ -1 +1,3 @@ CLASS wl net/minecraft/resource/ResourceReloadListener + METHOD a prepare (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a apply (Lwr;Ljava/lang/Object;Lafj;)V diff --git a/mappings/net/minecraft/resource/ResourceReloadStatus.mapping b/mappings/net/minecraft/resource/ResourceReloadStatus.mapping new file mode 100644 index 0000000000..97e53de91b --- /dev/null +++ b/mappings/net/minecraft/resource/ResourceReloadStatus.mapping @@ -0,0 +1 @@ +CLASS wo net/minecraft/resource/ResourceReloadStatus diff --git a/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping b/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping new file mode 100644 index 0000000000..f633871426 --- /dev/null +++ b/mappings/net/minecraft/resource/SynchronousResourceReloadListener.mapping @@ -0,0 +1,3 @@ +CLASS ws net/minecraft/resource/SynchronousResourceReloadListener + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V diff --git a/mappings/net/minecraft/tag/TagContainer.mapping b/mappings/net/minecraft/tag/TagContainer.mapping index 742ed4694f..f69b3173ac 100644 --- a/mappings/net/minecraft/tag/TagContainer.mapping +++ b/mappings/net/minecraft/tag/TagContainer.mapping @@ -10,9 +10,10 @@ CLASS yo net/minecraft/tag/TagContainer METHOD a getKeys ()Ljava/util/Collection; METHOD a getTagsFor (Ljava/lang/Object;)Ljava/util/Collection; ARG 1 object + METHOD a applyReload (Ljava/util/Map;)V METHOD a get (Lqd;)Lyn; ARG 1 id - METHOD a load (Lwr;)Ljava/util/concurrent/CompletableFuture; + METHOD a prepareReload (Lwr;)Ljava/util/concurrent/CompletableFuture; ARG 1 resourceManager METHOD a add (Lyn;)V ARG 1 tag diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping index dc24b885ad..268633e58c 100644 --- a/mappings/net/minecraft/tag/TagManager.mapping +++ b/mappings/net/minecraft/tag/TagManager.mapping @@ -6,6 +6,8 @@ CLASS yp net/minecraft/tag/TagManager METHOD a blocks ()Lym; METHOD a toPacket (Lis;)V ARG 1 buf + METHOD a (Lwr;Lafj;)Ljava/util/concurrent/CompletableFuture; + METHOD a (Lwr;Ljava/lang/Object;Lafj;)V METHOD b items ()Lym; METHOD b fromPacket (Lis;)Lyp; ARG 0 buf diff --git a/mappings/wt.mapping b/mappings/wt.mapping new file mode 100644 index 0000000000..8394501763 --- /dev/null +++ b/mappings/wt.mapping @@ -0,0 +1,2 @@ +CLASS wt + FIELD d status Lwo;