From 44295d60d05f88f7a11030d1d2155f7e88231154 Mon Sep 17 00:00:00 2001 From: asie Date: Fri, 26 Oct 2018 10:30:16 +0200 Subject: [PATCH] map chunk classes, some client work --- mappings/bgc.mapping | 21 ++++++++++++ mappings/bnu.mapping | 2 ++ mappings/bog.mapping | 1 + mappings/boh.mapping | 13 -------- mappings/bop.mapping | 1 + mappings/cje.mapping | 1 + mappings/cjh.mapping | 1 + mappings/clu.mapping | 2 ++ mappings/dgl.mapping | 15 +++++++++ mappings/dgn.mapping | 7 ++++ mappings/dko.mapping | 1 + .../net/minecraft/client/gl/GlHandler.mapping | 21 ++++++++++++ .../client/settings/GameSettings.mapping | 33 ++++++++++++++++++- .../client/tutorial/TutorialStep.mapping | 11 +++++++ .../net/minecraft/sound/SoundCategory.mapping | 14 ++++++++ .../net/minecraft/world/chunk/Chunk.mapping | 21 ++++++++++++ .../world/chunk/ChunkProvider.mapping | 4 +++ .../world/chunk/ChunkProviderClient.mapping | 1 + .../world/chunk/ChunkProviderServer.mapping | 6 ++++ .../world/chunk/ChunkSection.mapping | 1 + .../minecraft/world/chunk/IChunkView.mapping | 4 +++ 21 files changed, 167 insertions(+), 14 deletions(-) create mode 100644 mappings/bgc.mapping create mode 100644 mappings/bnu.mapping delete mode 100644 mappings/boh.mapping create mode 100644 mappings/cjh.mapping create mode 100644 mappings/dgl.mapping create mode 100644 mappings/dgn.mapping create mode 100644 mappings/dko.mapping create mode 100644 mappings/net/minecraft/client/tutorial/TutorialStep.mapping create mode 100644 mappings/net/minecraft/sound/SoundCategory.mapping create mode 100644 mappings/net/minecraft/world/chunk/Chunk.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkProvider.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkSection.mapping create mode 100644 mappings/net/minecraft/world/chunk/IChunkView.mapping diff --git a/mappings/bgc.mapping b/mappings/bgc.mapping new file mode 100644 index 0000000000..af9933cde4 --- /dev/null +++ b/mappings/bgc.mapping @@ -0,0 +1,21 @@ +CLASS bgc + METHOD (Lbdx$c;)V + ARG 0 builder + METHOD a isFertilizable (Layn;Leq;Lblz;Z)Z + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 remote + METHOD a canGrow (Laza;Ljava/util/Random;Leq;Lblz;)Z + ARG 0 world + ARG 1 rand + ARG 2 pos + ARG 3 state + METHOD b grow (Laza;Ljava/util/Random;Leq;Lblz;)V + ARG 0 world + ARG 1 rand + ARG 2 pos + ARG 3 state + METHOD c getRenderLayer ()Layo; + METHOD f isFullBoundsCubeForCulling (Lblz;)Z + ARG 0 state diff --git a/mappings/bnu.mapping b/mappings/bnu.mapping new file mode 100644 index 0000000000..91be370796 --- /dev/null +++ b/mappings/bnu.mapping @@ -0,0 +1,2 @@ +CLASS bnu + METHOD g getPos ()Layp; diff --git a/mappings/bog.mapping b/mappings/bog.mapping index f7221314bf..8bf9ca845c 100644 --- a/mappings/bog.mapping +++ b/mappings/bog.mapping @@ -4,5 +4,6 @@ CLASS bog ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos + METHOD g getPos ()Layp; METHOD h getBlockState (Leq;)Lblz; ARG 0 pos diff --git a/mappings/boh.mapping b/mappings/boh.mapping deleted file mode 100644 index d292e91e95..0000000000 --- a/mappings/boh.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS boh - METHOD a getBlockState (III)Lblz; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD a getFluidState (Leq;)Lcac; - ARG 0 pos - METHOD c (III)I - ARG 0 x - ARG 1 y - ARG 2 z - METHOD d getBlockEntity (Leq;)Lbkf; - ARG 0 pos diff --git a/mappings/bop.mapping b/mappings/bop.mapping index 8b4b883bf5..bc09b0122d 100644 --- a/mappings/bop.mapping +++ b/mappings/bop.mapping @@ -11,3 +11,4 @@ CLASS bop ARG 2 z METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos + METHOD g getPos ()Layp; diff --git a/mappings/cje.mapping b/mappings/cje.mapping index c345b8be3c..301e62ee55 100644 --- a/mappings/cje.mapping +++ b/mappings/cje.mapping @@ -2,3 +2,4 @@ CLASS cje CLASS cje$a METHOD equals (Ljava/lang/Object;)Z ARG 0 object + CLASS cje$b diff --git a/mappings/cjh.mapping b/mappings/cjh.mapping new file mode 100644 index 0000000000..dfb8b7a7a9 --- /dev/null +++ b/mappings/cjh.mapping @@ -0,0 +1 @@ +CLASS cjh diff --git a/mappings/clu.mapping b/mappings/clu.mapping index e05bd2e40a..84d6516996 100644 --- a/mappings/clu.mapping +++ b/mappings/clu.mapping @@ -1,3 +1,5 @@ CLASS clu + FIELD d forceUnicodeFont Z METHOD a onResourceReload (Lvs;)V ARG 0 container + METHOD a setForceUnicodeFont (Z)V diff --git a/mappings/dgl.mapping b/mappings/dgl.mapping new file mode 100644 index 0000000000..a5e4dfb5a8 --- /dev/null +++ b/mappings/dgl.mapping @@ -0,0 +1,15 @@ +CLASS dgl + FIELD c width I + FIELD d height I + METHOD a getWidth ()I + METHOD a getPixelRGBA (II)I + ARG 0 x + ARG 1 y + METHOD a setPixelRGBA (III)V + ARG 0 x + ARG 1 y + METHOD a resizeSubRectTo (IIIILdgl;)V + METHOD b getHeight ()I + METHOD b blendPixel (III)V + METHOD d makePixelArray ()[I + METHOD h checkAllocated ()V diff --git a/mappings/dgn.mapping b/mappings/dgn.mapping new file mode 100644 index 0000000000..cd5b42b5e2 --- /dev/null +++ b/mappings/dgn.mapping @@ -0,0 +1,7 @@ +CLASS dgn + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c game Lcjj; + FIELD l fullscreen Z + METHOD c updateSettingVsync ()V + METHOD h toggleFullscreen ()V + METHOD k isFullscreen ()Z diff --git a/mappings/dko.mapping b/mappings/dko.mapping new file mode 100644 index 0000000000..09bc00c9ba --- /dev/null +++ b/mappings/dko.mapping @@ -0,0 +1 @@ +CLASS dko diff --git a/mappings/net/minecraft/client/gl/GlHandler.mapping b/mappings/net/minecraft/client/gl/GlHandler.mapping index 20e6972270..2446271504 100644 --- a/mappings/net/minecraft/client/gl/GlHandler.mapping +++ b/mappings/net/minecraft/client/gl/GlHandler.mapping @@ -39,6 +39,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler FIELD a FRONT Ldgk$i; FIELD b BACK Ldgk$i; FIELD c FRONT_AND_BACK Ldgk$i; + FIELD d glValue I CLASS dgk$j CullFaceState FIELD a capState Ldgk$c; FIELD b mode I @@ -61,10 +62,12 @@ CLASS dgk net/minecraft/client/gl/GlHandler FIELD l SRC_ALPHA Ldgk$l; FIELD m SRC_COLOR Ldgk$l; FIELD n ZERO Ldgk$l; + FIELD o glValue I CLASS dgk$m FogMode FIELD a LINEAR Ldgk$m; FIELD b EXP Ldgk$m; FIELD c EXP2 Ldgk$m; + FIELD d glValue I CLASS dgk$n FogState FIELD a capState Ldgk$c; FIELD b mode I @@ -88,6 +91,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler FIELD n OR_REVERSE Ldgk$o; FIELD o SET Ldgk$o; FIELD p XOR Ldgk$o; + FIELD q glValue I CLASS dgk$p PolygonOffsetState FIELD a capFill Ldgk$c; FIELD b capLine Ldgk$c; @@ -124,6 +128,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler FIELD m SRC_ALPHA_SATURATE Ldgk$r; FIELD n SRC_COLOR Ldgk$r; FIELD o ZERO Ldgk$r; + FIELD p glValue I CLASS dgk$s StencilSubState FIELD a func I CLASS dgk$t StencilState @@ -145,6 +150,12 @@ CLASS dgk net/minecraft/client/gl/GlHandler CLASS dgk$x Texture2DState FIELD a capState Ldgk$c; FIELD b boundTexture I + CLASS dgk$y Viewport + FIELD a INSTANCE Ldgk$y; + FIELD b x I + FIELD c y I + FIELD d width I + FIELD e height I FIELD c alphaTestState Ldgk$a; FIELD d lightSystemEnabled Ldgk$c; FIELD f colorMaterial Ldgk$h; @@ -159,6 +170,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler FIELD o stencilState Ldgk$t; FIELD p normalizeEnabled Ldgk$c; FIELD q activeTexture I + FIELD r textureStates [Ldgk$x; FIELD s shadeModel I FIELD t rescaleNormalEnabled Ldgk$c; FIELD u colorMask Ldgk$g; @@ -176,6 +188,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD a pushAttrib ()V METHOD a clearDepth (D)V METHOD a scale (DDD)V + METHOD a rotate (DDDD)V METHOD a ortho (DDDDDD)V METHOD a fogDensity (F)V METHOD a polygonOffset (FF)V @@ -193,7 +206,10 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD a texEnv (IIF)V METHOD a texEnv (III)V METHOD a blendFuncSeparate (IIII)V + METHOD a texSubImage2D (IIIIIIIIJ)V METHOD a texImage2D (IIIIIIIILjava/nio/IntBuffer;)V + METHOD a readPixels (IIIIIIJ)V + METHOD a getTexImage (IIIIJ)V METHOD a texCoordPointer (IIILjava/nio/ByteBuffer;)V METHOD a normalPointer (IILjava/nio/ByteBuffer;)V METHOD a light (IILjava/nio/FloatBuffer;)V @@ -207,6 +223,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD a enableTextureGen (Ldgk$u;)V METHOD a texGenMode (Ldgk$u;I)V METHOD a texGen (Ldgk$u;ILjava/nio/FloatBuffer;)V + METHOD a multiplyMatrix (Ljava/nio/FloatBuffer;)V METHOD a depthMask (Z)V METHOD a colorMask (ZZZZ)V METHOD b translate (DDD)V @@ -214,9 +231,11 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD b scale (FFF)V METHOD b rotate (FFFF)V METHOD b disableLight (I)V + METHOD b pixelTransfer (IF)V METHOD b blendFunc (II)V METHOD b texParameter (IIF)V METHOD b texParameter (III)V + METHOD b viewport (IIII)V METHOD b vertexPointer (IIILjava/nio/ByteBuffer;)V METHOD b texEnv (IILjava/nio/FloatBuffer;)V METHOD b fog (ILjava/nio/FloatBuffer;)V @@ -252,6 +271,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD f enableLightSystem ()V METHOD f logicOp (I)V METHOD f newList (II)V + METHOD f normalPointer (III)V METHOD g disableLightSystem ()V METHOD g activeTexture (I)V METHOD g pixelStore (II)V @@ -268,6 +288,7 @@ CLASS dgk net/minecraft/client/gl/GlHandler METHOD k enableDepthTest ()V METHOD l disableBlend ()V METHOD m enableBlend ()V + METHOD m clear (I)V METHOD n matrixMode (I)V METHOD o enableFog ()V METHOD p disableFog ()V diff --git a/mappings/net/minecraft/client/settings/GameSettings.mapping b/mappings/net/minecraft/client/settings/GameSettings.mapping index bd0a7517b1..8216be96ac 100644 --- a/mappings/net/minecraft/client/settings/GameSettings.mapping +++ b/mappings/net/minecraft/client/settings/GameSettings.mapping @@ -13,9 +13,15 @@ CLASS cjm net/minecraft/client/settings/GameSettings FIELD K SHOW_SUBTITLES Lcjm$a; FIELD L REALMS_NOTIFICATIONS Lcjm$a; FIELD M AUTO_JUMP Lcjm$a; + FIELD N NARRATOR Lcjm$a; + FIELD O AUTO_SUGGEST_COMMANDS Lcjm$a; + FIELD P BIOME_BLEND_RADIUS Lcjm$a; + FIELD Q MOUSE_WHEEL_SENSITIVITY Lcjm$a; FIELD R slider Z FIELD S toggle Z FIELD T key Ljava/lang/String; + FIELD V min D + FIELD W max D FIELD a INVERT_MOUSE Lcjm$a; FIELD b SENSITIVITY Lcjm$a; FIELD c FOV Lcjm$a; @@ -36,23 +42,32 @@ CLASS cjm net/minecraft/client/settings/GameSettings FIELD r CHAT_OPACITY Lcjm$a; FIELD s CHAT_LINKS_PROMPT Lcjm$a; FIELD t SNOOPER Lcjm$a; + FIELD u FULLSCREEN_RESOLUTION Lcjm$a; FIELD v FULLSCREEN Lcjm$a; FIELD w VSYNC Lcjm$a; FIELD x VBO Lcjm$a; FIELD y TOUCHSCREEN Lcjm$a; FIELD z CHAT_SCALE Lcjm$a; METHOD a isSlider ()Z - METHOD a setMaximum (F)V + METHOD a (D)D + METHOD a setMaximumValue (F)V + ARG 0 value METHOD a getOption (I)Lcjm$a; METHOD b isToggle ()Z METHOD c getId ()I METHOD d getTranslationKey ()Ljava/lang/String; + METHOD e getMinimumValue ()D + METHOD f getMaximumValue ()D FIELD A pauseOnLostFocus Z FIELD B touchscreen Z FIELD C mainHand Lafp; FIELD D overrideWidth I FIELD E overrideHeight I FIELD F heldItemTooltips Z + FIELD G chatScale D + FIELD H chatWidth D + FIELD I chatHeightUnfocused D + FIELD J chatHeightFocused D FIELD K mipmapLevels I FIELD L useNativeTransport Z FIELD M entityShadows Z @@ -61,15 +76,23 @@ CLASS cjm net/minecraft/client/settings/GameSettings FIELD P showSubtitles Z FIELD Q realmsNotifications Z FIELD R autoJump Z + FIELD S tutorialStep Ldkq; + FIELD T autoSuggestions Z + FIELD U biomeBlendRadius I + FIELD V mouseWheelSensitivity D + FIELD W glDebugVerbosity I FIELD X keyForward Lcjf; FIELD Y keyLeft Lcjf; FIELD Z keyBack Lcjf; FIELD aB debugEnabled Z FIELD aE lastServer Ljava/lang/String; + FIELD aH fov D + FIELD aI gamma D FIELD aJ saturation F FIELD aK guiScale I FIELD aL particles I FIELD a COLON_SPLITTER Lcom/google/common/base/Splitter; + FIELD aM narrator I FIELD aN lang Ljava/lang/String; FIELD aO forceUnicodeFont Z FIELD aP LOGGER Lorg/apache/logging/log4j/Logger; @@ -100,10 +123,15 @@ CLASS cjm net/minecraft/client/settings/GameSettings FIELD ap keySmoothCamera Lcjf; FIELD aq keyFullscreen Lcjf; FIELD ar keySpectatorOutlines Lcjf; + FIELD as keyAdvancements Lcjf; FIELD at keysHotbar [Lcjf; + FIELD au keySaveToolbarActivator Lcjf; + FIELD av keyLoadToolbarActivator Lcjf; FIELD aw keysAll [Lcjf; FIELD ax game Lcjj; FIELD ay difficulty Lady; + FIELD b NARRATOR_SETTINGS [Ljava/lang/String; + FIELD c mouseSensitivity D FIELD d invertYMouse Z FIELD e viewDistance I FIELD f bobView Z @@ -118,8 +146,11 @@ CLASS cjm net/minecraft/client/settings/GameSettings FIELD o chatColors Z FIELD p chatLinks Z FIELD q chatLinksPrompt Z + FIELD r chatOpacity D FIELD s snooperEnabled Z FIELD t fullscreen Z + FIELD u fullscreenResolution Ljava/lang/String; + FIELD v enableVsync Z FIELD w useVbo Z FIELD x reducedDebugInfo Z FIELD y hideServerAddress Z diff --git a/mappings/net/minecraft/client/tutorial/TutorialStep.mapping b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping new file mode 100644 index 0000000000..ca130aa98a --- /dev/null +++ b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping @@ -0,0 +1,11 @@ +CLASS dkq net/minecraft/client/tutorial/TutorialStep + FIELD a MOVEMENT Ldkq; + FIELD b FIND_TREE Ldkq; + FIELD c PUNCH_TREE Ldkq; + FIELD d OPEN_INVENTORY Ldkq; + FIELD e CRAFT_PLANKS Ldkq; + FIELD f NONE Ldkq; + FIELD g name Ljava/lang/String; + METHOD a getName ()Ljava/lang/String; + METHOD a byName (Ljava/lang/String;)Ldkq; + ARG 0 name diff --git a/mappings/net/minecraft/sound/SoundCategory.mapping b/mappings/net/minecraft/sound/SoundCategory.mapping new file mode 100644 index 0000000000..71bb4be2d5 --- /dev/null +++ b/mappings/net/minecraft/sound/SoundCategory.mapping @@ -0,0 +1,14 @@ +CLASS wx net/minecraft/sound/SoundCategory + FIELD a MASTER Lwx; + FIELD b MUSIC Lwx; + FIELD c RECORD Lwx; + FIELD d WEATHER Lwx; + FIELD e BLOCK Lwx; + FIELD f HOSTILE Lwx; + FIELD g NEUTRAL Lwx; + FIELD h PLAYER Lwx; + FIELD i AMBIENT Lwx; + FIELD j VOICE Lwx; + FIELD k NAME_MAP Ljava/util/Map; + FIELD l name Ljava/lang/String; + METHOD a getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping new file mode 100644 index 0000000000..6b970c1978 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -0,0 +1,21 @@ +CLASS boh net/minecraft/world/chunk/Chunk + FIELD d LOGGER Lorg/apache/logging/log4j/Logger; + FIELD e sections [Lboi; + FIELD i world Laza; + FIELD y pos Layp; + METHOD (Laza;II[Lazx;Lbor;Lazp;Lazp;J[Lboi;Ljava/util/function/Consumer;)V + ARG 9 argSections + METHOD C getWorld ()Laza; + METHOD a getBlockState (III)Lblz; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a getFluidState (Leq;)Lcac; + ARG 0 pos + METHOD c (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD d getBlockEntity (Leq;)Lbkf; + ARG 0 pos + METHOD g getPos ()Layp; diff --git a/mappings/net/minecraft/world/chunk/ChunkProvider.mapping b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping new file mode 100644 index 0000000000..6f5e65fe82 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkProvider.mapping @@ -0,0 +1,4 @@ +CLASS bnz net/minecraft/world/chunk/ChunkProvider + METHOD b get (II)Layn; + ARG 0 chunkX + ARG 1 chunkZ diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping index 93a72a57d5..333949d778 100644 --- a/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkProviderClient.mapping @@ -1,4 +1,5 @@ CLASS cuu net/minecraft/world/chunk/ChunkProviderClient + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b emptyChunk Lboh; FIELD d chunkByIdMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; METHOD (Laza;)V diff --git a/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping new file mode 100644 index 0000000000..0d4efc8f8d --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkProviderServer.mapping @@ -0,0 +1,6 @@ +CLASS ty net/minecraft/world/chunk/ChunkProviderServer + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i world Laza; + METHOD b get (II)Layn; + ARG 0 chunkX + ARG 1 chunkZ diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping new file mode 100644 index 0000000000..dd58de5eae --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -0,0 +1 @@ +CLASS boi net/minecraft/world/chunk/ChunkSection diff --git a/mappings/net/minecraft/world/chunk/IChunkView.mapping b/mappings/net/minecraft/world/chunk/IChunkView.mapping new file mode 100644 index 0000000000..62c3db9e47 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/IChunkView.mapping @@ -0,0 +1,4 @@ +CLASS boj net/minecraft/world/chunk/IChunkView + METHOD b get (II)Layn; + ARG 0 chunkX + ARG 1 chunkZ