From 0f9c44a5415212712e6c1b25fd9e0ab334f0df19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Fri, 20 Mar 2020 20:16:55 +0200 Subject: [PATCH] Mappings relating to code that uses CsvWriter (#1186) * Mappings relating to code that uses CsvWriter * ok Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * :ok_hand: Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/server/world/ChunkTicketManager.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * directionalLighting -> shade * Revise param names for createArea * @Sollace misreads the code again Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../render/block/BlockModelRenderer.mapping | 4 ++++ .../client/render/model/BakedQuad.mapping | 3 +++ .../world/ChunkTaskPrioritySystem.mapping | 1 + .../server/world/ChunkTicketManager.mapping | 1 + .../server/world/ServerChunkManager.mapping | 1 + .../server/world/ServerTickScheduler.mapping | 1 + .../minecraft/server/world/ServerWorld.mapping | 13 +++++++++++-- .../world/ThreadedAnvilChunkStorage.mapping | 2 +- .../minecraft/test/StructureTestUtil.mapping | 17 +++++++++++++++++ .../net/minecraft/world/BlockRenderView.mapping | 3 +++ 10 files changed, 43 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 0bb54b9cc1..9a6471a103 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -52,9 +52,13 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender METHOD method_3365 renderQuad (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFLjava/util/List;II)V METHOD method_3367 render (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_1087;FFFII)V METHOD method_3370 renderQuadsFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;IIZLnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Ljava/util/BitSet;)V + ARG 1 world + ARG 2 state + ARG 3 pos ARG 4 light ARG 5 overlay ARG 6 useWorldLight + ARG 7 matrices ARG 9 quads ARG 10 flags METHOD method_3373 renderFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z diff --git a/mappings/net/minecraft/client/render/model/BakedQuad.mapping b/mappings/net/minecraft/client/render/model/BakedQuad.mapping index e74b051d04..e3fa1526dd 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuad.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuad.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_777 net/minecraft/client/render/model/BakedQuad + FIELD field_22441 shade Z FIELD field_4173 face Lnet/minecraft/class_2350; FIELD field_4174 colorIndex I FIELD field_4175 vertexData [I @@ -8,6 +9,8 @@ CLASS net/minecraft/class_777 net/minecraft/client/render/model/BakedQuad ARG 2 colorIndex ARG 3 face ARG 4 sprite + ARG 5 shade + METHOD method_24874 hasShade ()Z METHOD method_3357 getVertexData ()[I METHOD method_3358 getFace ()Lnet/minecraft/class_2350; METHOD method_3359 getColorIndex ()I diff --git a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping index f58af29af6..a763a065b8 100644 --- a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping +++ b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_3900 net/minecraft/server/world/ChunkTaskPrioritySyste ARG 2 actor METHOD method_17632 getQueue (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3899; ARG 1 actor + METHOD method_21680 getDebugString ()Ljava/lang/String; CLASS class_3946 Task FIELD field_17446 function Ljava/util/function/Function; FIELD field_17447 pos J diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index d4311769f6..8816a18a52 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -69,6 +69,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 4 argument METHOD method_21623 getTicket (J)Ljava/lang/String; ARG 1 pos + METHOD method_21683 toDumpString ()Ljava/lang/String; CLASS class_3205 DistanceFromNearestPlayerTracker FIELD field_13896 distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap; FIELD field_17461 maxDistance I diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 4db8f9b2b3..e010a56bd1 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -70,6 +70,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_20587 initChunkCaches ()V METHOD method_20727 (Lnet/minecraft/class_1297;)Z ARG 1 entity + METHOD method_21694 getPendingTasks ()I METHOD method_21738 putInCache (JLnet/minecraft/class_2791;Lnet/minecraft/class_2806;)V ARG 1 pos ARG 3 chunk diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping index c65ecd3f99..b11fbeb9db 100644 --- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping +++ b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1949 net/minecraft/server/world/ServerTickScheduler ARG 2 src ARG 3 bounds ARG 4 move + METHOD method_20825 getTicks ()I METHOD method_8666 copyScheduledTicks (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;)V ARG 1 box ARG 2 offset diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index e1cf28f82a..5b8f6ea33b 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -128,6 +128,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_19495 getRaidManager ()Lnet/minecraft/class_3767; METHOD method_19496 handleInteraction (Lnet/minecraft/class_4151;Lnet/minecraft/class_1297;Lnet/minecraft/class_4094;)V ARG 1 interaction + ARG 2 entity ARG 3 observer METHOD method_19497 isNearOccupiedPointOfInterest (Lnet/minecraft/class_2338;I)Z ARG 1 pos @@ -141,8 +142,16 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z - METHOD method_21624 exportEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V - METHOD method_21626 exportBlockEntities (Ljava/io/Writer;)V + ARG 1 sectionPos + METHOD method_21624 dumpEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V + ARG 0 writer + ARG 1 entities + METHOD method_21625 dump (Ljava/nio/file/Path;)V + METHOD method_21626 dumpBlockEntities (Ljava/io/Writer;)V + ARG 1 writer + METHOD method_23658 clearUpdatesInArea (Lnet/minecraft/class_3341;)V + ARG 1 box + METHOD method_23660 wakeSleepingPlayers ()V METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338; METHOD method_8414 init (Lnet/minecraft/class_1940;)V ARG 1 levelInfo diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 55e89c9a04..3ce3136c07 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -118,7 +118,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_20617 generateChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture; METHOD method_20619 loadChunk (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos - METHOD method_21619 exportChunks (Ljava/io/Writer;)V + METHOD method_21619 dump (Ljava/io/Writer;)V METHOD method_21676 getFutureStatus (Ljava/util/concurrent/CompletableFuture;)Ljava/lang/String; CLASS class_3208 EntityTracker FIELD field_18246 entry Lnet/minecraft/class_3231; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 4fc508ea74..5a454405b9 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 1 radius ARG 2 world METHOD method_22246 clearArea (Lnet/minecraft/class_3341;ILnet/minecraft/class_3218;)V + ARG 0 area + ARG 2 world METHOD method_22247 isInStructureBounds (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)Z ARG 0 structureBlockPos ARG 1 pos @@ -14,6 +16,10 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V ARG 0 pos ARG 1 world + METHOD method_22250 (Ljava/lang/String;Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + ARG 0 structureId + ARG 1 pos + ARG 3 world METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)V ARG 0 structure ARG 1 pos @@ -38,3 +44,14 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 radius ARG 2 world + METHOD method_22368 (ILnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V + ARG 0 altitude + ARG 1 pos + ARG 2 world + METHOD method_22369 createStructure (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; + ARG 0 structureId + ARG 1 world + METHOD method_23646 createArea (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_3341; + ARG 0 pos + ARG 1 size + ARG 2 margin diff --git a/mappings/net/minecraft/world/BlockRenderView.mapping b/mappings/net/minecraft/world/BlockRenderView.mapping index 2b319187b0..2fb6d6cbb0 100644 --- a/mappings/net/minecraft/world/BlockRenderView.mapping +++ b/mappings/net/minecraft/world/BlockRenderView.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_1920 net/minecraft/world/BlockRenderView METHOD method_23752 getColor (Lnet/minecraft/class_2338;Lnet/minecraft/world/level/ColorResolver;)I ARG 1 pos ARG 2 colorResolver + METHOD method_24852 getBrightness (Lnet/minecraft/class_2350;Z)F + ARG 1 direction + ARG 2 shaded METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I