From 37756970dcfe6fb569947eab88f9e7b9ee685b84 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 16 Jan 2019 10:48:01 -0500 Subject: [PATCH] A few rendering mappings (#401) * A few rendering mappings * Fix something * Fix something --- mappings/cpr.mapping | 5 ++ mappings/dhp.mapping | 2 - .../minecraft/client/MinecraftClient.mapping | 29 ++++++++---- .../client/WindowEventHandler.mapping | 2 +- .../client/options/GameOptions.mapping | 3 ++ .../client/options/KeyBinding.mapping | 16 +++++++ .../client/render/BackgroundRenderer.mapping | 29 ++++++++++++ .../render/ChunkRenderDispatcher.mapping | 1 + .../minecraft/client/render/Frustum.mapping | 14 ++++++ .../client/render/FrustumWithOrigin.mapping | 19 ++++++++ .../client/render/GameRenderer.mapping | 46 +++++++++++++++++-- .../client/render/GlMatrixFrustum.mapping | 8 ++++ .../client/render/VisibleRegion.mapping | 7 +++ .../client/render/WorldRenderer.mapping | 40 +++++++++++++++- .../client/render/chunk/ChunkBatcher.mapping | 1 + ...taTask.mapping => ChunkRenderTask.mapping} | 7 ++- .../client/render/chunk/ChunkRenderer.mapping | 8 +++- .../render/chunk/ChunkRendererList.mapping | 16 +++++++ .../chunk/DisplayListChunkRenderer.mapping | 6 +++ .../DisplayListChunkRendererList.mapping | 2 + .../render/chunk/VboChunkRendererList.mapping | 3 ++ ...derDebug.mapping => DebugRenderer.mapping} | 3 +- .../client/render/model/ModelLoader.mapping | 10 ++++ .../client/search/SearchManager.mapping | 5 +- .../client/texture/TextureStitcher.mapping | 1 + .../net/minecraft/client/util/Window.mapping | 44 ++++++++++++++---- mappings/net/minecraft/entity/Entity.mapping | 5 ++ .../entity/decoration/ItemFrameEntity.mapping | 1 + .../entity/mob/ShulkerEntity.mapping | 1 + .../ExplosiveProjectileEntity.mapping | 1 + .../ResourcePackContainerManager.mapping | 2 +- .../net/minecraft/util/SystemUtil.mapping | 2 +- .../util/profiler/DisableableProfiler.mapping | 11 +++++ 33 files changed, 317 insertions(+), 33 deletions(-) create mode 100644 mappings/cpr.mapping delete mode 100644 mappings/dhp.mapping create mode 100644 mappings/net/minecraft/client/render/BackgroundRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/Frustum.mapping create mode 100644 mappings/net/minecraft/client/render/FrustumWithOrigin.mapping create mode 100644 mappings/net/minecraft/client/render/GlMatrixFrustum.mapping create mode 100644 mappings/net/minecraft/client/render/VisibleRegion.mapping rename mappings/net/minecraft/client/render/chunk/{ChunkRenderDataTask.mapping => ChunkRenderTask.mapping} (83%) create mode 100644 mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/DisplayListChunkRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/DisplayListChunkRendererList.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/VboChunkRendererList.mapping rename mappings/net/minecraft/client/render/debug/{RenderDebug.mapping => DebugRenderer.mapping} (89%) diff --git a/mappings/cpr.mapping b/mappings/cpr.mapping new file mode 100644 index 0000000000..115624e43d --- /dev/null +++ b/mappings/cpr.mapping @@ -0,0 +1,5 @@ +CLASS cpr + METHOD a (Lark;ZFLdhz;)V + ARG 3 frustum + METHOD a getBlockState (Lbbr;Lahd;F)Lbqe; + METHOD b getFluidState (Lbbr;Lahd;F)Lcfs; diff --git a/mappings/dhp.mapping b/mappings/dhp.mapping deleted file mode 100644 index c67469bb00..0000000000 --- a/mappings/dhp.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dhp - METHOD a delete ()V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2023ea4d78..a923ae5079 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -20,6 +20,8 @@ CLASS cpz net/minecraft/client/MinecraftClient FIELD V cameraEntity Lahd; FIELD W searchManager Ldrb; FIELD X session Lcqg; + FIELD Y isPaused Z + FIELD Z pausedTickDelta F FIELD aA spriteAtlas Ldoj; FIELD aB soundLoader Ldrp; FIELD aC musicTracker Ldrm; @@ -32,9 +34,11 @@ CLASS cpz net/minecraft/client/MinecraftClient FIELD aJ toastManager Lcse; FIELD aK game Lcpu; FIELD aL isRunning Z + FIELD aM nextDebugInfoUpdateTime J FIELD aN fpsCounter I FIELD aO tutorialManager Ldrz; FIELD aP isWindowFocused Z + FIELD aQ renderTaskQueue Ljava/util/Queue; FIELD aR openProfilerSection Ljava/lang/String; FIELD a isSystemMac Z FIELD aa server Ldrg; @@ -48,6 +52,7 @@ CLASS cpz net/minecraft/client/MinecraftClient FIELD aj itemUseCooldown I FIELD ak autoConnectServerIp Ljava/lang/String; FIELD al autoConnectServerPort I + FIELD an lastMetricsSampleTime J FIELD ao is64Bit Z FIELD ap isDemo Z FIELD aq clientConnection Lir; @@ -66,15 +71,17 @@ CLASS cpz net/minecraft/client/MinecraftClient FIELD e interactionManager Ldcb; FIELD f window Lcow; FIELD g world Ldcc; - FIELD h renderer Ldey; + FIELD h worldRenderer Ldey; FIELD i player Ldeh; + FIELD j targetedEntity Lahd; FIELD k particleManager Lddl; FIELD l fontRenderer Lcqn; FIELD m currentGui Lcug; - FIELD n worldRenderer Ldeu; - FIELD o renderDebug Ldif; + FIELD n gameRenderer Ldeu; + FIELD o debugRenderer Ldif; FIELD p attackCooldown I - FIELD q hudInGame Lcqo; + FIELD q inGameHud Lcqo; + FIELD r skipGameRender Z FIELD s hitResult Lcmp; FIELD t options Lcqb; FIELD u mouse Lcqa; @@ -107,6 +114,9 @@ CLASS cpz net/minecraft/client/MinecraftClient METHOD a onResolutionChanged ()V METHOD a handleProfilerKeyPress (I)V ARG 1 digit + METHOD a handleGlErrorByDisableVsync (IJ)V + ARG 1 error + ARG 2 description METHOD a addSnooperInfo (Lagg;)V METHOD a setCameraEntity (Lahd;)V ARG 1 entity @@ -121,7 +131,7 @@ CLASS cpz net/minecraft/client/MinecraftClient METHOD a startIntegratedServer (Ljava/lang/String;Ljava/lang/String;Lbck;)V ARG 1 name ARG 2 displayName - METHOD a setWindowFocused (Z)V + METHOD a onWindowFocusChanged (Z)V ARG 1 focused METHOD aA drawProfilerResults ()V METHOD aB doAttack ()V @@ -134,7 +144,7 @@ CLASS cpz net/minecraft/client/MinecraftClient METHOD ab getDataFixer ()Lcom/mojang/datafixers/DataFixer; METHOD ac getTickDelta ()F METHOD ae getBlockColorMap ()Lcqi; - METHOD af_ openInGameMenu ()V + METHOD af_ openPauseMenu ()V METHOD ag hasReducedDebugInfo ()Z METHOD ah getToastManager ()Lcse; METHOD ai getTutorialManager ()Ldrz; @@ -145,6 +155,7 @@ CLASS cpz net/minecraft/client/MinecraftClient METHOD an getProfiler ()Lafd; METHOD ao getGame ()Lcpu; METHOD aq init ()V + METHOD ar initializeSearchableContainers ()V METHOD as checkIs64Bit ()Z METHOD at startTimerHackThread ()V METHOD au checkGameData ()V @@ -161,13 +172,14 @@ CLASS cpz net/minecraft/client/MinecraftClient ARG 1 connectedToRealms METHOD d getGameVersion ()Ljava/lang/String; METHOD d render (Z)V + ARG 1 fullRender METHOD e getVersionType ()Ljava/lang/String; METHOD f forcesUnicodeFont ()Z METHOD g reloadResources ()V METHOD h getLevelStorage ()Lciz; METHOD i stop ()V METHOD j cleanUpAfterCrash ()V - METHOD k stopThread ()V + METHOD k scheduleStop ()V METHOD m getMusicTracker ()Ldrm; METHOD n tick ()V METHOD o isDemo ()Z @@ -178,4 +190,5 @@ CLASS cpz net/minecraft/client/MinecraftClient METHOD v reloadResourcesConcurrently ()Ljava/util/concurrent/CompletableFuture; METHOD w getMaxTextureSize ()I METHOD x getCurrentServerEntry ()Ldcf; - METHOD y isIntegratedServerRunning ()Z + METHOD y isInSingleplayer ()Z + METHOD z isIntegratedServerRunning ()Z diff --git a/mappings/net/minecraft/client/WindowEventHandler.mapping b/mappings/net/minecraft/client/WindowEventHandler.mapping index afd446ac33..071c8e57b4 100644 --- a/mappings/net/minecraft/client/WindowEventHandler.mapping +++ b/mappings/net/minecraft/client/WindowEventHandler.mapping @@ -1,6 +1,6 @@ CLASS cox net/minecraft/client/WindowEventHandler METHOD a onResolutionChanged ()V - METHOD a setWindowFocused (Z)V + METHOD a onWindowFocusChanged (Z)V ARG 1 focused METHOD a_ updateDisplay (Z)V ARG 1 respectFramerateLimit diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping index 821d863152..56f7912e55 100644 --- a/mappings/net/minecraft/client/options/GameOptions.mapping +++ b/mappings/net/minecraft/client/options/GameOptions.mapping @@ -128,6 +128,7 @@ CLASS cqb net/minecraft/client/options/GameOptions FIELD au keysAll [Lcpx; FIELD av client Lcpz; FIELD aw difficulty Lafw; + FIELD ax hudHidden Z FIELD az debugEnabled Z FIELD b NARRATOR_SETTINGS [Ljava/lang/String; FIELD c mouseSensitivity D @@ -163,6 +164,8 @@ CLASS cqb net/minecraft/client/options/GameOptions METHOD a updateOption (Lcqb$a;I)V ARG 1 option METHOD a parseFloat (Ljava/lang/String;)F + METHOD a addResourcePackContainersToManager (Lwi;)V + ARG 1 manager METHOD a getSoundVolume (Lxv;)F METHOD a setSoundVolume (Lxv;F)V ARG 1 category diff --git a/mappings/net/minecraft/client/options/KeyBinding.mapping b/mappings/net/minecraft/client/options/KeyBinding.mapping index c86cb84172..8346b0f96b 100644 --- a/mappings/net/minecraft/client/options/KeyBinding.mapping +++ b/mappings/net/minecraft/client/options/KeyBinding.mapping @@ -7,6 +7,8 @@ CLASS cpx net/minecraft/client/options/KeyBinding FIELD f defaultKeyCode Lcol$a; FIELD g category Ljava/lang/String; FIELD h keyCode Lcol$a; + FIELD i pressed Z + FIELD j timesPressed I METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 1 id ARG 2 keyCode @@ -16,16 +18,30 @@ CLASS cpx net/minecraft/client/options/KeyBinding ARG 2 type ARG 3 code ARG 4 category + METHOD a updatePressedStates ()V METHOD a matchesMouse (I)Z ARG 1 code METHOD a matchesKey (II)Z ARG 1 keyCode ARG 2 scanCode + METHOD a onKeyPressed (Lcol$a;)V + ARG 0 keyCode + METHOD a setKeyPressed (Lcol$a;Z)V + ARG 0 key + ARG 1 pressed + METHOD a compareTo (Lcpx;)I + ARG 1 o + METHOD b unpressAll ()V METHOD b setKeyCode (Lcol$a;)V METHOD b equals (Lcpx;)Z + METHOD c updateKeysByCode ()V + METHOD d isPressed ()Z METHOD e getCategory ()Ljava/lang/String; + METHOD f wasPressed ()Z METHOD g getId ()Ljava/lang/String; METHOD h getDefaultKeyCode ()Lcol$a; METHOD i isNotBound ()Z + METHOD j getLocalizedName ()Ljava/lang/String; METHOD k isDefault ()Z METHOD l getName ()Ljava/lang/String; + METHOD m reset ()V diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping new file mode 100644 index 0000000000..e8d684e414 --- /dev/null +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -0,0 +1,29 @@ +CLASS det net/minecraft/client/render/BackgroundRenderer + FIELD a blackColorBuffer Ljava/nio/FloatBuffer; + FIELD b colorBuffer Ljava/nio/FloatBuffer; + FIELD c red F + FIELD d green F + FIELD e blue F + FIELD f bufferRed F + FIELD g bufferGreen F + FIELD h bufferBlue F + FIELD i waterFogColor I + FIELD j nextWaterFogColor I + FIELD k lastWaterFogColorUpdateTime J + FIELD l gameRenderer Ldeu; + FIELD m client Lcpz; + METHOD (Ldeu;)V + ARG 1 gameRenderer + METHOD a getColorAsBuffer ()Ljava/nio/FloatBuffer; + METHOD a renderBackground (F)V + ARG 1 tickDelta + METHOD a updateColorNotInWater (Lahd;Lbcf;F)V + ARG 1 camera + ARG 2 world + ARG 3 tickDelta + METHOD a updateColorInWater (Lahd;Lbcj;F)V + ARG 1 entity + ARG 2 world + ARG 3 tickDelta + METHOD a updateFogColor (Z)V + ARG 1 black diff --git a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping b/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping index f6603b561b..838d54792e 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping @@ -7,6 +7,7 @@ CLASS dfi net/minecraft/client/render/ChunkRenderDispatcher ARG 1 world ARG 3 renderer METHOD a delete ()V + METHOD a updateCameraPosition (DD)V METHOD a getChunkIndex (III)I METHOD a scheduleChunkRender (IIIZ)V METHOD a createChunks (Ldhr;)V diff --git a/mappings/net/minecraft/client/render/Frustum.mapping b/mappings/net/minecraft/client/render/Frustum.mapping new file mode 100644 index 0000000000..0593dba4c6 --- /dev/null +++ b/mappings/net/minecraft/client/render/Frustum.mapping @@ -0,0 +1,14 @@ +CLASS dhz net/minecraft/client/render/Frustum + FIELD a sides [[F + METHOD a getDistanceFromPlane ([FDDD)D + ARG 1 plane + ARG 2 x + ARG 4 y + ARG 6 z + METHOD b intersects (DDDDDD)Z + ARG 1 minX + ARG 3 minY + ARG 5 minZ + ARG 7 maxX + ARG 9 maxY + ARG 11 maxZ diff --git a/mappings/net/minecraft/client/render/FrustumWithOrigin.mapping b/mappings/net/minecraft/client/render/FrustumWithOrigin.mapping new file mode 100644 index 0000000000..07fe98066c --- /dev/null +++ b/mappings/net/minecraft/client/render/FrustumWithOrigin.mapping @@ -0,0 +1,19 @@ +CLASS dhy net/minecraft/client/render/FrustumWithOrigin + FIELD a frustum Ldhz; + FIELD b originX D + FIELD c originY D + FIELD d originZ D + METHOD (Ldhz;)V + ARG 1 frustum + METHOD a setOrigin (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD a intersects (DDDDDD)Z + ARG 1 minX + ARG 3 minY + ARG 5 minZ + ARG 7 maxX + ARG 9 maxY + ARG 11 maxZ + METHOD a intersects (Lcmo;)Z diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 49d3ae327b..97577b5296 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -1,24 +1,62 @@ CLASS deu net/minecraft/client/render/GameRenderer + FIELD A backgroundRenderer Ldet; + FIELD F floatingItem Laxd; + FIELD G floatingItemTimeLeft I + FIELD H floatingItemWidth F + FIELD I floatingItemHeight F + FIELD J shader Ldfd; + FIELD M SHADERS_LOCATIONS [Lqe; + FIELD N forcedShaderIndex I + FIELD O shadersEnabled Z FIELD a firstPersonRenderer Ldew; + FIELD b SHADER_COUNT I FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d RAIN_LOC Lqe; FIELD e SNOW_LOC Lqe; FIELD f client Lcpz; FIELD g resourceContainer Lwq; FIELD h random Ljava/util/Random; + FIELD i viewDistance F FIELD j mapRenderer Lcqq; + FIELD l targetedEntity Lahd; + FIELD q tickEndSkyDarkness F + FIELD r tickStartSkyDarkness F + FIELD t blockOutlineEnabled Z + FIELD u lastWorldIconUpdate J + FIELD v lastRenderTime J FIELD w lightmapTextureManager Ldez; METHOD (Lcpz;Lwq;)V ARG 1 client - METHOD a onSetCameraEntity (Lahd;)V + METHOD a updateTargettedEntity (F)V + ARG 1 tickDelta + METHOD a renderWorld (FJ)V + ARG 1 tickDelta + METHOD a render (FJZ)V + ARG 1 tickDelta + ARG 2 startTime + ARG 4 fullRender + METHOD a renderFloatingItem (IIF)V + ARG 1 scaledWidth + ARG 2 scaledHeight + ARG 3 tickDelta + METHOD a onCameraEntitySet (Lahd;)V + METHOD a showFloatingItem (Laxd;)V + ARG 1 item METHOD a loadShader (Lqe;)V METHOD a onResourceReload (Lwq;)V ARG 1 manager - METHOD d (F)F - ARG 1 delta + METHOD b disableShader ()V + METHOD b renderCenter (FJ)V + ARG 1 tickDelta + METHOD c toggleShadersEnabled ()V + METHOD d getSkyDarkness (F)F + ARG 1 tickDelta METHOD e tick ()V METHOD f getShader ()Ldfd; METHOD h disableLightmap ()V METHOD i enableLightmap ()V METHOD k getMapRenderer ()Lcqq; - METHOD l getGame ()Lcpz; + METHOD l getClient ()Lcpz; + METHOD m getViewDistance ()F + METHOD o updateWorldIcon ()V + METHOD p shouldRenderBlockOutline ()Z diff --git a/mappings/net/minecraft/client/render/GlMatrixFrustum.mapping b/mappings/net/minecraft/client/render/GlMatrixFrustum.mapping new file mode 100644 index 0000000000..8658f6f6fb --- /dev/null +++ b/mappings/net/minecraft/client/render/GlMatrixFrustum.mapping @@ -0,0 +1,8 @@ +CLASS dhx net/minecraft/client/render/GlMatrixFrustum + FIELD e INSTANCE Ldhx; + FIELD f projectionMatrixBuffer Ljava/nio/FloatBuffer; + FIELD g modelviewMatrixBuffer Ljava/nio/FloatBuffer; + METHOD a get ()Ldhz; + METHOD a normalize ([F)V + ARG 1 vector + METHOD b loadFromGlMatrices ()V diff --git a/mappings/net/minecraft/client/render/VisibleRegion.mapping b/mappings/net/minecraft/client/render/VisibleRegion.mapping new file mode 100644 index 0000000000..3d1d35879b --- /dev/null +++ b/mappings/net/minecraft/client/render/VisibleRegion.mapping @@ -0,0 +1,7 @@ +CLASS dhw net/minecraft/client/render/VisibleRegion + METHOD a setOrigin (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD a intersects (Lcmo;)Z + ARG 1 boundingBox diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 110be91b4e..2f7f9c5ab8 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -2,14 +2,34 @@ CLASS dey net/minecraft/client/render/WorldRenderer FIELD A ticks I FIELD B partiallyBrokenBlocks Ljava/util/Map; FIELD D destroyStages [Ldok; - FIELD E framebuffer Lcog; + FIELD E entityOutlinesFramebuffer Lcog; + FIELD F entityOutlineShader Ldfd; + FIELD G lastCameraChunkUpdateX D + FIELD H lastCameraChunkUpdateY D + FIELD I lastCameraChunkUpdateZ D + FIELD J cameraChunkX I + FIELD K cameraChunkY I + FIELD L cameraChunkZ I + FIELD M lastCameraX D + FIELD N lastCameraY D + FIELD O lastCameraZ D + FIELD P lastCameraPitch D + FIELD Q lastCameraYaw D FIELD W chunkBatcher Ldhm; + FIELD X chunkRendererList Ldeo; FIELD Y renderDistance I FIELD a DIRECTIONS [Ley; FIELD aa totalEntities I FIELD ab renderedEntities I + FIELD ae forcedFrustum Ldhz; + FIELD ag forcedFrustumPosition Lcpg; FIELD ah vertexBufferObjectsEnabled Z FIELD ai chunkRendererFactory Ldhr; + FIELD aj lastTranslucentSortX D + FIELD ak lastTranslucentSortY D + FIELD al lastTranslucentSortZ D + FIELD am terrainUpdateNecessary Z + FIELD an entityOutlinesUpdateNecessary Z FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c MOON_PHASES_TEX Lqe; FIELD d SUN_TEX Lqe; @@ -20,6 +40,7 @@ CLASS dey net/minecraft/client/render/WorldRenderer FIELD i textureManager Ldol; FIELD j entityRenderDispatcher Ldjp; FIELD k world Ldcc; + FIELD l chunkRenderers Ljava/util/Set; FIELD o chunkRenderDispatcher Ldfi; FIELD p starsDisplayList I FIELD t starsBuffer Lcpn; @@ -44,10 +65,17 @@ CLASS dey net/minecraft/client/render/WorldRenderer METHOD a onGlobalWorldEvent (ILet;I)V ARG 1 eventId ARG 2 pos + METHOD a updateChunks (J)V METHOD a onEntityAdded (Lahd;)V METHOD a renderWorldBorder (Lahd;F)V ARG 1 camera ARG 2 delta + METHOD a setUpTerrain (Lahd;FLdhw;IZ)V + ARG 1 camera + ARG 2 tickDelta + METHOD a doesEntityHaveOutline (Lahd;Lahd;Ldhw;)Z + ARG 1 entity + ARG 2 camera METHOD a renderEntities (Lahd;Ldhw;F)V ARG 1 cameraEntity METHOD a onWorldEvent (Lark;ILet;I)V @@ -80,6 +108,12 @@ CLASS dey net/minecraft/client/render/WorldRenderer ARG 2 pos ARG 3 oldState ARG 4 newState + METHOD a renderLayer (Lbbs;)V + ARG 1 layer + METHOD a renderLayer (Lbbs;DLahd;)I + ARG 1 layer + ARG 2 tickDelta + ARG 4 camera METHOD a drawBoxOutline (Lcmo;FFFF)V ARG 0 box ARG 1 red @@ -148,6 +182,7 @@ CLASS dey net/minecraft/client/render/WorldRenderer METHOD a playRecord (Lxt;Let;)V METHOD a getRandomParticleSpawnChance (Z)I ARG 1 canSpawnOnMinimal + METHOD b loadEntityOutlineShader ()V METHOD b drawBox (DDDDDDFFFF)V ARG 0 minX ARG 2 minY @@ -210,7 +245,8 @@ CLASS dey net/minecraft/client/render/WorldRenderer ARG 10 velocityX ARG 12 velocityY ARG 14 velocityZ - METHOD c drawFramebuffer ()V + METHOD c drawEntityOutlinesFramebuffer ()V + METHOD d canDrawEntityOutlines ()Z METHOD f getChunksDebugString ()Ljava/lang/String; METHOD g getChunkNumber ()I METHOD h getEntitiesDebugString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping index 019d7f4638..105531c26f 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping @@ -10,4 +10,5 @@ CLASS dhm net/minecraft/client/render/chunk/ChunkBatcher METHOD a getDebugString ()Ljava/lang/String; METHOD a addAvailableBuffer (Lden;)V METHOD c getNextAvailableBuffer ()Lden; + METHOD c resortTransparency (Ldhq;)Z METHOD d getNextChunkRenderDataTask ()Ldhl; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping similarity index 83% rename from mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping index 8ebb1f1451..7b2bb712e6 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderDataTask.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping @@ -1,6 +1,5 @@ -CLASS dhl net/minecraft/client/render/chunk/ChunkRenderDataTask +CLASS dhl net/minecraft/client/render/chunk/ChunkRenderTask CLASS dhl$a Stage - FIELD a INIT Ldhl$a; CLASS dhl$b Mode FIELD a chunkRenderer Ldhq; FIELD b lock Ljava/util/concurrent/locks/ReentrantLock; @@ -10,6 +9,7 @@ CLASS dhl net/minecraft/client/render/chunk/ChunkRenderDataTask FIELD g bufferBuilder Lden; FIELD h renderData Ldho; FIELD i stage Ldhl$a; + FIELD j cancelled Z METHOD (Ldhq;Ldhl$b;DLdhs;)V ARG 1 chunkRenderer ARG 2 mode @@ -19,10 +19,13 @@ CLASS dhl net/minecraft/client/render/chunk/ChunkRenderDataTask METHOD a setStage (Ldhl$a;)V METHOD a compareTo (Ldhl;)I METHOD a setRenderData (Ldho;)V + ARG 1 renderData + METHOD a add (Ljava/lang/Runnable;)V METHOD b getChunkRenderer ()Ldhq; METHOD d getRenderData ()Ldho; METHOD e getBufferBuilders ()Lden; METHOD f cancel ()V METHOD g getLock ()Ljava/util/concurrent/locks/ReentrantLock; METHOD h getMode ()Ldhl$b; + METHOD i isCancelled ()Z METHOD j getDistanceToPlayerSquared ()D diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping index 6bcede01c7..93a5f3005f 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkRenderer.mapping @@ -7,7 +7,9 @@ CLASS dhq net/minecraft/client/render/chunk/ChunkRenderer FIELD f chunkRenderLock Ljava/util/concurrent/locks/ReentrantLock; FIELD h chunkRenderDataTask Ldhl; FIELD i blockEntities Ljava/util/Set; + FIELD j transformationMatrix Ljava/nio/FloatBuffer; FIELD k buffers [Lcpn; + FIELD n origin Let$a; METHOD a delete ()V METHOD a endBufferBuilding (Lbbs;FFFLcpj;Ldho;)V METHOD a beginBufferBuilding (Lcpj;Let;)V @@ -15,7 +17,11 @@ CLASS dhq net/minecraft/client/render/chunk/ChunkRenderer METHOD b getGlBuffer (I)Lcpn; METHOD c cancel ()V METHOD d getChunkRenderLock ()Ljava/util/concurrent/locks/ReentrantLock; - METHOD g distanceToPlayerSquared ()D + METHOD f getResortTransparencyTask ()Ldhl; + METHOD g getDistanceToPlayerSquared ()D + METHOD h multiplyMatrix ()V METHOD i getChunkRenderData ()Ldho; METHOD j clear ()V + METHOD l getOrigin ()Let; METHOD p getWorld ()Lbcf; + METHOD q updateTransformationMatrix ()V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping b/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping new file mode 100644 index 0000000000..51b5ec58d6 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/ChunkRendererList.mapping @@ -0,0 +1,16 @@ +CLASS deo net/minecraft/client/render/chunk/ChunkRendererList + FIELD a chunkRenderers Ljava/util/List; + FIELD b isCameraPositionSet Z + FIELD c cameraX D + FIELD d cameraY D + FIELD e cameraZ D + METHOD a setCameraPosition (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD a render (Lbbs;)V + ARG 1 layer + METHOD a translateToOrigin (Ldhq;)V + ARG 1 renderer + METHOD a add (Ldhq;Lbbs;)V + ARG 2 layer diff --git a/mappings/net/minecraft/client/render/chunk/DisplayListChunkRenderer.mapping b/mappings/net/minecraft/client/render/chunk/DisplayListChunkRenderer.mapping new file mode 100644 index 0000000000..3947aace26 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/DisplayListChunkRenderer.mapping @@ -0,0 +1,6 @@ +CLASS dhp net/minecraft/client/render/chunk/DisplayListChunkRenderer + FIELD d displayListsStartIndex I + METHOD (Lbcf;Ldey;)V + ARG 1 world + ARG 2 worldRenderer + METHOD a delete ()V diff --git a/mappings/net/minecraft/client/render/chunk/DisplayListChunkRendererList.mapping b/mappings/net/minecraft/client/render/chunk/DisplayListChunkRendererList.mapping new file mode 100644 index 0000000000..9eedc00646 --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/DisplayListChunkRendererList.mapping @@ -0,0 +1,2 @@ +CLASS dfb net/minecraft/client/render/chunk/DisplayListChunkRendererList + METHOD a render (Lbbs;)V diff --git a/mappings/net/minecraft/client/render/chunk/VboChunkRendererList.mapping b/mappings/net/minecraft/client/render/chunk/VboChunkRendererList.mapping new file mode 100644 index 0000000000..f06a52581e --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/VboChunkRendererList.mapping @@ -0,0 +1,3 @@ +CLASS dfh net/minecraft/client/render/chunk/VboChunkRendererList + METHOD a render (Lbbs;)V + ARG 1 layer diff --git a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping similarity index 89% rename from mappings/net/minecraft/client/render/debug/RenderDebug.mapping rename to mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index 36856fbbec..03d4e1a73b 100644 --- a/mappings/net/minecraft/client/render/debug/RenderDebug.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -1,4 +1,4 @@ -CLASS dif net/minecraft/client/render/debug/RenderDebug +CLASS dif net/minecraft/client/render/debug/DebugRenderer CLASS dif$a DebugRenderer METHOD a render (FJ)V FIELD a pathfindingDebugRenderer Ldij; @@ -19,5 +19,6 @@ CLASS dif net/minecraft/client/render/debug/RenderDebug FIELD s showCaves Z FIELD t showStructures Z FIELD v showWorldGenAttempts Z + METHOD a shouldRender ()Z METHOD a renderDebuggers (FJ)V METHOD b toggleShowChunkBorder ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index b75e7632fc..422f79ed4e 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -9,6 +9,16 @@ CLASS dpx net/minecraft/client/render/model/ModelLoader FIELD G modelRotationCache Ljava/util/Map; FIELD H modelsToBake Ljava/util/Map; FIELD I bakedModels Ljava/util/Map; + FIELD f DESTROY_STAGE_0 Lqe; + FIELD g DESTROY_STAGE_1 Lqe; + FIELD h DESTROY_STAGE_2 Lqe; + FIELD i DESTROY_STAGE_3 Lqe; + FIELD j DESTROY_STAGE_4 Lqe; + FIELD k DESTROY_STAGE_5 Lqe; + FIELD l DESTROY_STAGE_6 Lqe; + FIELD m DESTROY_STAGE_7 Lqe; + FIELD n DESTROY_STAGE_8 Lqe; + FIELD o DESTROY_STAGE_9 Lqe; FIELD p MISSING Ldpz; FIELD q MISSING_DEFINITION Ljava/lang/String; FIELD r GENERATION_MARKER Ldfw; diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index abf93ef1a3..a615e63ed5 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -1,7 +1,8 @@ CLASS drb net/minecraft/client/search/SearchManager CLASS drb$a Key - FIELD a ITEMS_TOOLTIP Ldrb$a; - FIELD b ITEMS_TAG Ldrb$a; + FIELD a ITEM_TOOLTIP Ldrb$a; + FIELD b ITEM_TAG Ldrb$a; + FIELD c RECIPE_OUTPUT Ldrb$a; FIELD d instances Ljava/util/Map; METHOD a get (Ldrb$a;)Ldqy; ARG 1 key diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping index 62bc1fe694..b449e4548c 100644 --- a/mappings/net/minecraft/client/texture/TextureStitcher.mapping +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -10,6 +10,7 @@ CLASS doh net/minecraft/client/texture/TextureStitcher FIELD b y I FIELD c width I FIELD d height I + FIELD e subSlots Ljava/util/List; FIELD f spriteHolder Ldoh$a; METHOD a getSpriteHolder ()Ldoh$a; METHOD a tryFit (Ldoh$a;)Z diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 6fca7b8ada..a29920d17f 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -7,37 +7,65 @@ CLASS cow net/minecraft/client/util/Window FIELD f handle J FIELD k videoMode Ljava/util/Optional; FIELD l fullscreen Z - FIELD r windowWidth I - FIELD s windowHeight I + FIELD n positionX I + FIELD o positionY I + FIELD p width I + FIELD q height I + FIELD r framebufferWidth I + FIELD s framebufferHeight I FIELD t scaledWidth I FIELD u scaledHeight I + FIELD v scaleFactor D FIELD w phase Ljava/lang/String; FIELD z framerateLimit I METHOD a logOnGlError ()V + METHOD a setScaleFactor (D)V + ARG 1 scaleFactor METHOD a setFramerateLimit (I)V METHOD a logGlError (IJ)V ARG 1 error ARG 2 description - METHOD a setWindowIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V + METHOD a calculateScaleFactor (IZ)I + ARG 1 guiScale + ARG 2 forceUnicodeFont + METHOD a onWindowPosChanged (JII)V + ARG 1 window + ARG 3 xpos + ARG 4 ypos + METHOD a onWindowFocusChanged (JZ)V + ARG 1 window + ARG 3 focused + METHOD a setIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V ARG 1 icon16 ARG 2 icon32 METHOD a setPhase (Ljava/lang/String;)V ARG 1 phase METHOD b getFramerateLimit ()I METHOD b throwExceptionForGlError (IJ)V - METHOD b onSizeChanged (JII)V - ARG 1 handle + METHOD b onFramebufferSizeChanged (JII)V + ARG 1 window + ARG 3 width + ARG 4 height METHOD b setVsync (Z)V METHOD c waitForFramerateLimit ()V + METHOD c onWindowSizeChanged (JII)V + ARG 1 window + ARG 3 width + ARG 4 height METHOD c setFullscreen (Z)V METHOD d getVideoMode ()Ljava/util/Optional; METHOD g toggleFullscreen ()V METHOD h getHandle ()J METHOD i isFullscreen ()Z - METHOD j getWindowWidth ()I - METHOD k getWindowHeight ()I + METHOD j getFramebufferWidth ()I + METHOD k getFramebufferHeight ()I METHOD l pollEvents ()V + METHOD m getWidth ()I + METHOD n getHeight ()I METHOD o getScaledWidth ()I METHOD p getScaledHeight ()I + METHOD q getPositionX ()I + METHOD r getPositionY ()I + METHOD s getScaleFactor ()D METHOD t throwExceptionOnGlError ()V - METHOD u getMonitor ()V + METHOD u updateMonitor ()V diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 1655942c51..25329db8db 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -91,6 +91,9 @@ CLASS ahd net/minecraft/entity/Entity ARG 3 y ARG 5 z METHOD a rayTrace (DFLcmq;)Lcmp; + ARG 1 maxDistance + ARG 3 tickDelta + ARG 4 fluidMode METHOD a setSize (FF)V ARG 1 width ARG 2 height @@ -165,6 +168,7 @@ CLASS ahd net/minecraft/entity/Entity METHOD aL getHeightOffset ()D METHOD aM getMountedHeightOffset ()D METHOD aO removeAllPassengers ()V + METHOD aP getBoundingBoxMarginForTargetting ()F METHOD aR getRotationClient ()Lcmr; METHOD aS getRotationVecClient ()Lcms; METHOD aT getDefaultPortalCooldown ()I @@ -296,6 +300,7 @@ CLASS ahd net/minecraft/entity/Entity METHOD h squaredDistanceTo (Lahd;)D METHOD h setGlowing (Z)V METHOD i getCameraPosVec (F)Lcms; + ARG 1 tickDelta METHOD i setBreath (I)V METHOD i pushAwayFrom (Lahd;)V METHOD i setInvisible (Z)V diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index 74089b2ba5..55c8743d28 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -15,6 +15,7 @@ CLASS aow net/minecraft/entity/decoration/ItemFrameEntity METHOD a setFacing (Ley;)V METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpt;)V + METHOD aP getBoundingBoxMarginForTargetting ()F METHOD b interact (Lark;Lafy;)Z ARG 1 player METHOD b setHeldItemStack (Laxd;)V diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index afc4a1b3ef..70f74b5ed2 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -46,6 +46,7 @@ CLASS aqk net/minecraft/entity/mob/ShulkerEntity ARG 3 difficulty METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpt;)V + METHOD aP getBoundingBoxMarginForTargetting ()F METHOD b setPosition (DDD)V ARG 1 x METHOD b writeCustomDataToTag (Lhs;)V diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index d0b30707a3..0769e7e425 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -13,6 +13,7 @@ CLASS arp net/minecraft/entity/projectile/ExplosiveProjectileEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD aB getLightmapCoordinates ()I METHOD aE doesCollide ()Z + METHOD aP getBoundingBoxMarginForTargetting ()F METHOD b writeCustomDataToTag (Lhs;)V METHOD f getParticleType ()Lft; METHOD h update ()V diff --git a/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping b/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping index 1aee5eb100..b3db31f1e5 100644 --- a/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackContainerManager.mapping @@ -6,7 +6,7 @@ CLASS wi net/minecraft/resource/ResourcePackContainerManager METHOD a callCreators ()V METHOD a getContainer (Ljava/lang/String;)Lwl; ARG 1 name - METHOD a resetEnabled (Ljava/util/Collection;)V + METHOD a setEnabled (Ljava/util/Collection;)V ARG 1 enabled METHOD a addCreator (Lwj;)V ARG 1 creator diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index 4dc30eabe5..46e3b296d5 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -16,7 +16,7 @@ CLASS m net/minecraft/util/SystemUtil METHOD a open (Ljava/net/URI;)V METHOD a open (Ljava/net/URL;)V METHOD b getURLOpenCommand (Ljava/net/URL;)[Ljava/lang/String; - FIELD a NANO_TIME_SUPPLIER Ljava/util/function/LongSupplier; + FIELD a nanoTimeSupplier Ljava/util/function/LongSupplier; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c ILLEGAL_FILE_NAME_PATTERN Ljava/util/regex/Pattern; METHOD a toMap ()Ljava/util/stream/Collector; diff --git a/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping b/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping index 04f8fac8f6..574bfe6081 100644 --- a/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping +++ b/mappings/net/minecraft/util/profiler/DisableableProfiler.mapping @@ -1,4 +1,15 @@ CLASS aez net/minecraft/util/profiler/DisableableProfiler + CLASS aez$a ProfilerController + METHOD a isEnabled ()Z + METHOD b disable ()Lafc; + METHOD c getResults ()Lafc; + METHOD d enable ()V + CLASS aez$b ProfilerControllerImpl + FIELD a profiler Lafb; + METHOD a isEnabled ()Z + METHOD b disable ()Lafc; + METHOD c getResults ()Lafc; + METHOD d enable ()V FIELD b tickSupplier Ljava/util/function/IntSupplier; FIELD c controller Laez$b; METHOD (Ljava/util/function/IntSupplier;)V