From 3d49f465171dc21db6e2cf8cc7047c6725da879d Mon Sep 17 00:00:00 2001 From: SquidDev Date: Fri, 14 Dec 2018 14:05:56 +0000 Subject: [PATCH] Several mappings for chunk/block rerendering (#286) Also fleshes out a couple of other missing mappings within `World` - most of these are existing methods which just forward to another. --- mappings/dgt.mapping | 2 ++ .../net/minecraft/client/render/Renderer.mapping | 3 ++- .../client/render/chunk/ChunkRenderDataTask.mapping | 1 + .../render/chunk/ChunkRenderDispatcher.mapping | 6 ++++++ .../client/render/chunk/ChunkRenderer.mapping | 6 +++++- mappings/net/minecraft/util/math/MathHelper.mapping | 2 +- mappings/net/minecraft/world/IWorld.mapping | 2 ++ mappings/net/minecraft/world/World.mapping | 12 +++++++++--- mappings/net/minecraft/world/WorldListener.mapping | 3 +++ mappings/uy.mapping | 2 ++ 10 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 mappings/dgt.mapping diff --git a/mappings/dgt.mapping b/mappings/dgt.mapping new file mode 100644 index 0000000000..69a77e85ce --- /dev/null +++ b/mappings/dgt.mapping @@ -0,0 +1,2 @@ +CLASS dgt + METHOD a delete ()V diff --git a/mappings/net/minecraft/client/render/Renderer.mapping b/mappings/net/minecraft/client/render/Renderer.mapping index b822d7256c..8c54823e94 100644 --- a/mappings/net/minecraft/client/render/Renderer.mapping +++ b/mappings/net/minecraft/client/render/Renderer.mapping @@ -22,7 +22,7 @@ CLASS dee net/minecraft/client/render/Renderer FIELD o chunkRenderDispatcher Ldeo; METHOD a reload ()V METHOD a renderSky (F)V - METHOD a markRegionForRenderUpdate (IIIZ)V + METHOD a scheduleChunkRender (IIIZ)V METHOD a onGlobalWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos @@ -66,6 +66,7 @@ CLASS dee net/minecraft/client/render/Renderer ARG 1 manager METHOD a playRecord (Lxm;Let;)V METHOD b renderCuboidOutline (DDDDDDFFFF)V + METHOD b scheduleChunkRender (III)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping index 7555742ae8..e4f8d25079 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping @@ -22,6 +22,7 @@ CLASS dgp net/minecraft/client/render/chunk/ChunkRenderDataTask METHOD b getChunkRenderer ()Ldgu; METHOD d getRenderData ()Ldgs; METHOD e getVertexBuffer ()Lddt; + METHOD f cancel ()V METHOD g getLock ()Ljava/util/concurrent/locks/ReentrantLock; METHOD h getMode ()Ldgp$b; METHOD j getDistanceToPlayerSquared ()D diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderDispatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderDispatcher.mapping index 84e6425664..6e0e0bed34 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderDispatcher.mapping @@ -1,7 +1,13 @@ CLASS deo net/minecraft/client/render/chunk/ChunkRenderDispatcher FIELD a renderer Ldee; FIELD b world Lbbp; + FIELD c sizeY I FIELD f renderers [Ldgu; METHOD (Lbbp;ILdee;Ldgv;)V ARG 1 world ARG 3 renderer + METHOD a delete ()V + METHOD a getChunkIndex (III)I + METHOD a scheduleChunkRender (IIIZ)V + METHOD a createChunks (Ldgv;)V + METHOD a getChunk (Let;)Ldgu; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping index 21000e3265..faa4561115 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping @@ -8,8 +8,12 @@ CLASS dgu net/minecraft/client/render/chunk/ChunkRenderer FIELD h chunkRenderDataTask Ldgp; FIELD i blockEntities Ljava/util/Set; FIELD k buffers [Lcoy; - METHOD a markRenderUpdate (Z)V + METHOD a delete ()V + METHOD a scheduleRender (Z)V + METHOD c cancel ()V METHOD d getChunkRenderLock ()Ljava/util/concurrent/locks/ReentrantLock; METHOD g distanceToPlayerSquared ()D METHOD i getChunkRenderData ()Ldgs; + METHOD j clear ()V + METHOD n ()Z METHOD p getWorld ()Lbbp; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 92960e93fd..564a690040 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -69,7 +69,7 @@ CLASS yw net/minecraft/util/math/MathHelper METHOD b cos (F)F METHOD b floorMod (FF)F METHOD b wrapDegrees (I)I - METHOD b floorMOd (II)I + METHOD b floorMod (II)I METHOD b packRgb (III)I ARG 0 r ARG 1 g diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 3ad3f0b4ea..bdddb0dcf8 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -4,12 +4,14 @@ CLASS bbq net/minecraft/world/IWorld METHOD G getBlockTickScheduler ()Lbcg; METHOD a playSound (Larb;Let;Lxm;Lxo;FF)V METHOD a updateNeighbors (Let;Lbgs;)V + METHOD a addParticle (Lft;DDDDDD)V METHOD a getVisibleEntities (Ljava/lang/Class;Lclz;)Ljava/util/List; ARG 1 entityClass METHOD a getEntities (Ljava/lang/Class;Lclz;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entityClass METHOD ai getDifficulty ()Lafm; METHOD b isChunkLoaded (II)Z + METHOD f getWorld ()Lbbp; METHOD g getLevelProperties ()Lcih; METHOD g getLocalDifficulty (Let;)Lafn; METHOD i getSaveHandler ()Lcii; diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 568abbbcf8..9a4b95b70b 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -56,7 +56,7 @@ CLASS bbp net/minecraft/world/World METHOD V getGameRules ()Lbbl; METHOD W isThundering ()Z METHOD X isRaining ()Z - METHOD a (DDD)Larb; + METHOD a findClosestVisiblePlayer (DDD)Larb; ARG 1 x METHOD a containsVisiblePlayer (DDDD)Z ARG 1 x @@ -83,7 +83,7 @@ CLASS bbp net/minecraft/world/World ARG 1 x ARG 2 y ARG 3 z - METHOD a (IILbrf;Z)Lbra; + METHOD a getChunk (IILbrf;Z)Lbra; ARG 1 chunkX ARG 2 chunkZ ARG 3 requiredState @@ -98,6 +98,7 @@ CLASS bbp net/minecraft/world/World ARG 1 entity ARG 2 x ARG 4 y + METHOD a createExplosion (Lagv;DDDFZZ)Lbbi; METHOD a (Lagv;F)Lcmd; ARG 1 entity METHOD a createExplosion (Lagv;Lage;DDDFZZ)Lbbi; @@ -172,6 +173,8 @@ CLASS bbp net/minecraft/world/World METHOD a playRecord (Let;Lxm;)V METHOD a breakBlock (Let;Z)Z ARG 1 pos + METHOD a addParticle (Lft;DDDDDD)V + METHOD a addParticle (Lft;ZDDDDDD)V METHOD a countTransientEntities (Ljava/lang/Class;I)I METHOD a getClosestVisibleEntityTo (Ljava/lang/Class;Lclz;Lagv;)Lagv; ARG 1 clazz @@ -194,10 +197,11 @@ CLASS bbp net/minecraft/world/World METHOD ac getRaidState ()Lash; METHOD af getProfiler ()Laeu; METHOD b tickTime ()V - METHOD b findClosestVisiblePlayer (DDDD)Z + METHOD b findVisiblePlayer (DDDD)Z ARG 1 x ARG 3 y METHOD b getEntityById (I)Lagv; + METHOD b scheduleNeighborChunksRender (III)V METHOD b fireWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos @@ -239,6 +243,7 @@ CLASS bbp net/minecraft/world/World METHOD e isRemote ()Z METHOD e getFogColor (F)Lcmd; METHOD e getBiome (Let;)Lbco; + METHOD f getWorld ()Lbbp; METHOD f getBlockEntity (Let;)Lbnq; ARG 1 pos METHOD g getLevelProperties ()Lcih; @@ -260,6 +265,7 @@ CLASS bbp net/minecraft/world/World METHOD m_ updateEntities ()V METHOD n getChunk (Let;)Lbrm; METHOD o getDimension ()Lbsf; + METHOD o scheduleBlockRender (Let;)V METHOD q removeBlockEntity (Let;)V METHOD q_ getSeaLevel ()I METHOD r_ getSeed ()J diff --git a/mappings/net/minecraft/world/WorldListener.mapping b/mappings/net/minecraft/world/WorldListener.mapping index ae6f522197..e0680fab23 100644 --- a/mappings/net/minecraft/world/WorldListener.mapping +++ b/mappings/net/minecraft/world/WorldListener.mapping @@ -1,4 +1,6 @@ CLASS bbs net/minecraft/world/WorldListener + METHOD a scheduleNeighborChunksRender (III)V + METHOD a scheduleRangeRender (IIIIII)V METHOD a onGlobalWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos @@ -25,6 +27,7 @@ CLASS bbs net/minecraft/world/WorldListener ARG 7 z METHOD a addParticle (Lft;ZZDDDDDD)V METHOD a playRecord (Lxm;Let;)V + METHOD b scheduleChunkRender (III)V METHOD b onBlockBreakingStage (ILet;I)V ARG 1 entityId ARG 2 pos diff --git a/mappings/uy.mapping b/mappings/uy.mapping index 7293e3b70c..95210330df 100644 --- a/mappings/uy.mapping +++ b/mappings/uy.mapping @@ -41,6 +41,7 @@ CLASS uy ARG 1 pos METHOD a breakBlock (Let;Z)Z ARG 1 pos + METHOD a addParticle (Lft;DDDDDD)V METHOD a getEntities (Ljava/lang/Class;Lclz;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entityClass METHOD b isChunkLoaded (II)Z @@ -53,6 +54,7 @@ CLASS uy METHOD d isAir (Let;)Z METHOD e isRemote ()Z METHOD e getBiome (Let;)Lbco; + METHOD f getWorld ()Lbbp; METHOD f getBlockEntity (Let;)Lbnq; ARG 1 pos METHOD g getLevelProperties ()Lcih;