From 4af63f77cf3366621dd7c69adc57b5b92ddacd84 Mon Sep 17 00:00:00 2001 From: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Date: Sun, 27 Jun 2021 06:13:39 -0400 Subject: [PATCH] Map debug renderers stuff (#2520) * Map some things in VillageDebugRenderer * Map constants in BeeDebugRenderer * PathfindingDebugRenderer mappings * StructureDebugRenderer mappings * GameEventDebugRenderer mappings * ChunkLoadingDebugRenderer mappings * GoalSelectorDebugRenderer and HeightmapDebugRenderer mappings * GameTest, RaidCenter, VillageSections and SkyLight DebugRenderers mappings * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * getNamesOfVillagersWithPotentialJobSite -> getNamesOfJobSitePotentialOwners and getNamesOfVillagersWithPointOfInterest -> getNamesOfPointOfInterestTicketHolders Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../render/debug/BeeDebugRenderer.mapping | 11 ++++++ .../debug/ChunkLoadingDebugRenderer.mapping | 5 +++ .../debug/GameEventDebugRenderer.mapping | 10 +++++ .../debug/GameTestDebugRenderer.mapping | 4 ++ .../debug/GoalSelectorDebugRenderer.mapping | 1 + .../debug/HeightmapDebugRenderer.mapping | 4 ++ .../debug/PathfindingDebugRenderer.mapping | 7 ++++ .../debug/RaidCenterDebugRenderer.mapping | 3 ++ .../debug/SkyLightDebugRenderer.mapping | 1 + .../debug/StructureDebugRenderer.mapping | 7 ++++ .../render/debug/VillageDebugRenderer.mapping | 37 ++++++++++++++++++- .../VillageSectionsDebugRenderer.mapping | 1 + .../minecraft/village/VillagerGossips.mapping | 3 ++ 13 files changed, 92 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index a3b982714d..2e20accd27 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -3,6 +3,17 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere FIELD field_21533 hives Ljava/util/Map; FIELD field_21534 bees Ljava/util/Map; FIELD field_21535 targetedEntity Ljava/util/UUID; + FIELD field_32855 HIVE_RANGE I + FIELD field_32856 BEE_RANGE I + FIELD field_32857 TARGET_ENTITY_RANGE I + FIELD field_32859 DEFAULT_DRAWN_STRING_SIZE F + FIELD field_32860 WHITE I + FIELD field_32861 YELLOW I + FIELD field_32862 ORANGE I + FIELD field_32863 GREEN I + FIELD field_32864 GRAY I + FIELD field_32865 PINK I + FIELD field_32866 RED I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_23803 (JLjava/util/Map$Entry;)Z diff --git a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping index 3d82e87fe5..1ad8da13fe 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping @@ -2,8 +2,13 @@ CLASS net/minecraft/class_860 net/minecraft/client/render/debug/ChunkLoadingDebu FIELD field_20998 loadingData Lnet/minecraft/class_860$class_4605; FIELD field_4509 client Lnet/minecraft/class_310; FIELD field_4510 lastUpdateTime D + FIELD field_4511 LOADING_DATA_CHUNK_RANGE I METHOD (Lnet/minecraft/class_310;)V ARG 1 client CLASS class_4605 ChunkLoadingStatus FIELD field_21000 clientStates Ljava/util/Map; FIELD field_21001 serverStates Ljava/util/concurrent/CompletableFuture; + METHOD (Lnet/minecraft/class_860;Lnet/minecraft/class_1132;DD)V + ARG 2 server + ARG 3 x + ARG 5 z diff --git a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping index 11e0923e72..adc3b42c6a 100644 --- a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping @@ -12,8 +12,18 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR METHOD method_33088 addListener (Lnet/minecraft/class_5716;I)V ARG 1 positionSource ARG 2 range + METHOD method_33089 drawBoxIfCameraReady (Lnet/minecraft/class_238;FFFF)V + ARG 0 box + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha + METHOD method_33090 (Lnet/minecraft/class_287;DDDLnet/minecraft/class_2338;)V + ARG 7 pos METHOD method_33091 (Lnet/minecraft/class_5739$class_5741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_2338;)V ARG 9 pos + METHOD method_33092 (Lnet/minecraft/class_2338;)V + ARG 0 pos CLASS class_5740 Entry FIELD field_28258 startingMs J FIELD field_28259 event Lnet/minecraft/class_5712; diff --git a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping index 2ec3ccfee4..81a8614a11 100644 --- a/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameTestDebugRenderer.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_4503 net/minecraft/client/render/debug/GameTestDebugRenderer FIELD field_20520 markers Ljava/util/Map; + FIELD field_32901 MARKER_BOX_SIZE F METHOD method_22123 addMarker (Lnet/minecraft/class_2338;ILjava/lang/String;I)V ARG 1 pos ARG 2 color ARG 3 message ARG 4 duration + METHOD method_23111 renderMarker (Lnet/minecraft/class_2338;Lnet/minecraft/class_4503$class_4504;)V + ARG 1 pos + ARG 2 marker CLASS class_4504 Marker FIELD field_20521 color I FIELD field_20522 message Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index bd41cb6cad..f23c4b856a 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDebugRenderer FIELD field_18780 client Lnet/minecraft/class_310; FIELD field_18781 goalSelectors Ljava/util/Map; + FIELD field_32902 RANGE I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V diff --git a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping index 6b69ec9350..06ef9f7950 100644 --- a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_867 net/minecraft/client/render/debug/HeightmapDebugRenderer + FIELD field_32903 CHUNK_RANGE I + FIELD field_32904 BOX_HEIGHT F FIELD field_4613 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client + METHOD method_27037 getColorForHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_1160; + ARG 1 type diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index 169dc3f9b4..fd0ee16d46 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebugRenderer + FIELD field_32906 MAX_PATH_AGE J + FIELD field_32907 RANGE F + FIELD field_32913 DRAWN_STRING_SIZE F FIELD field_4615 pathTimes Ljava/util/Map; FIELD field_4616 paths Ljava/util/Map; + FIELD field_4617 nodeSizes Ljava/util/Map; METHOD method_23117 drawPathLines (Lnet/minecraft/class_11;DDD)V ARG 0 path ARG 1 cameraX @@ -9,6 +13,7 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug METHOD method_23118 drawPath (Lnet/minecraft/class_11;FZZDDD)V ARG 0 path ARG 1 nodeSize + ARG 2 drawDebugNodes ARG 3 drawLabels ARG 4 cameraX ARG 6 cameraY @@ -21,6 +26,7 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug METHOD method_23121 drawPathInternal (Lnet/minecraft/class_11;FZZDDD)V ARG 0 path ARG 1 nodeSize + ARG 2 drawDebugNodes ARG 3 drawLabels ARG 4 cameraX ARG 6 cameraY @@ -28,3 +34,4 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug METHOD method_3869 addPath (ILnet/minecraft/class_11;F)V ARG 1 id ARG 2 path + ARG 3 nodeSize diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index 481c8db2f4..14150d4a51 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebugRenderer FIELD field_19326 client Lnet/minecraft/class_310; FIELD field_19327 raidCenters Ljava/util/Collection; + FIELD field_32914 RANGE I + FIELD field_32915 DRAWN_STRING_SIZE F METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V @@ -10,4 +12,5 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug METHOD method_23123 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;I)V ARG 0 string ARG 1 pos + ARG 2 color METHOD method_23125 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping index 36c1eaf729..5d4f3badb1 100644 --- a/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/SkyLightDebugRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_866 net/minecraft/client/render/debug/SkyLightDebugRenderer + FIELD field_32905 RANGE I FIELD field_4612 client Lnet/minecraft/class_310; METHOD (Lnet/minecraft/class_310;)V ARG 1 client diff --git a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping index 727633e4fd..ff72ed1af2 100644 --- a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_870 net/minecraft/client/render/debug/StructureDebugRenderer + FIELD field_32916 RANGE I FIELD field_4624 client Lnet/minecraft/class_310; + FIELD field_4626 structureBoundingBoxes Ljava/util/Map; + FIELD field_4627 structurePiecesBoundingBoxes Ljava/util/Map; METHOD (Lnet/minecraft/class_310;)V ARG 1 client + METHOD method_3871 addStructure (Lnet/minecraft/class_3341;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_2874;)V + ARG 1 boundingBox + ARG 2 piecesBoundingBoxes + ARG 4 dimension diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index d997379fbf..90cfc010e1 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -4,6 +4,18 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen FIELD field_18920 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_18921 brains Ljava/util/Map; FIELD field_18922 targetedEntity Ljava/util/UUID; + FIELD field_32867 YELLOW I + FIELD field_32868 AQUA I + FIELD field_32869 GREEN I + FIELD field_32870 GRAY I + FIELD field_32871 PINK I + FIELD field_32872 RED I + FIELD field_32873 ORANGE I + FIELD field_32894 POI_RANGE I + FIELD field_32895 BRAIN_RANGE I + FIELD field_32896 TARGET_ENTITY_RANGE I + FIELD field_32897 DEFAULT_DRAWN_STRING_SIZE F + FIELD field_32898 WHITE I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V @@ -15,6 +27,10 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen METHOD method_19702 setFreeTicketCount (Lnet/minecraft/class_2338;I)V ARG 1 pos ARG 2 freeTicketCount + METHOD method_23126 (Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_23127 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4232;)Z + ARG 1 brain METHOD method_23128 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4233;)V ARG 2 poi METHOD method_23129 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/List;)V @@ -57,9 +73,9 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 2 cameraX ARG 4 cameraY ARG 6 cameraZ - METHOD method_23141 getVillagerNames (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; + METHOD method_23141 getNamesOfPointOfInterestTicketHolders (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 pointOfInterest - METHOD method_23142 getBrains (Lnet/minecraft/class_2338;)Ljava/util/Collection; + METHOD method_23142 getBrainsContainingPointOfInterest (Lnet/minecraft/class_2338;)Ljava/util/Collection; ARG 1 pointOfInterest METHOD method_23144 getGhostPointsOfInterest ()Ljava/util/Map; METHOD method_23145 isTargeted (Lnet/minecraft/class_4207$class_4232;)Z @@ -72,6 +88,12 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen METHOD method_24804 (Ljava/util/Map$Entry;)Z ARG 1 entry METHOD method_24805 removeRemovedBrains ()V + METHOD method_29384 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4207$class_4232;)Z + ARG 1 brain + METHOD method_29385 getNamesOfJobSitePotentialOwners (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; + ARG 1 potentialJobSite + METHOD method_29386 getBrainsContainingPotentialJobSite (Lnet/minecraft/class_2338;)Ljava/util/Collection; + ARG 1 potentialJobSite METHOD method_35797 removeBrain (I)V ARG 1 entityId METHOD method_35798 (ILnet/minecraft/class_4207$class_4232;)Z @@ -81,25 +103,36 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen FIELD field_18924 entityId I FIELD field_18925 profession Ljava/lang/String; FIELD field_18926 pos Lnet/minecraft/class_2374; + FIELD field_18927 possibleActivities Ljava/util/List; + FIELD field_18928 runningTasks Ljava/util/List; FIELD field_18930 pointsOfInterest Ljava/util/Set; + FIELD field_19328 name Ljava/lang/String; FIELD field_19329 xp I FIELD field_19330 path Lnet/minecraft/class_11; + FIELD field_19372 inventory Ljava/lang/String; FIELD field_19373 wantsGolem Z + FIELD field_19374 memories Ljava/util/List; + FIELD field_19375 gossips Ljava/util/List; FIELD field_22406 health F FIELD field_22407 maxHealth F + FIELD field_25287 potentialJobSites Ljava/util/Set; METHOD (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;Z)V ARG 1 uuid ARG 2 entityId + ARG 3 name ARG 4 profession ARG 5 xp ARG 6 health ARG 7 maxHealth ARG 8 pos + ARG 9 inventory ARG 10 path ARG 11 wantsGolem METHOD method_23149 getUuid ()Ljava/util/UUID; METHOD method_23151 isPointOfInterest (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_29388 isPotentialJobSite (Lnet/minecraft/class_2338;)Z + ARG 1 pos CLASS class_4233 PointOfInterest FIELD field_18931 pos Lnet/minecraft/class_2338; FIELD field_18933 freeTicketCount I diff --git a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping index 37ee92adfc..f614c465b1 100644 --- a/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageSectionsDebugRenderer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4841 net/minecraft/client/render/debug/VillageSectionsDebugRenderer FIELD field_22409 sections Ljava/util/Set; + FIELD field_32917 RANGE I METHOD method_24806 drawSections (DDD)V ARG 1 cameraX ARG 3 cameraY diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index a46dea5c49..9e7a723558 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -27,6 +27,9 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 2 gossipTypeFilter METHOD method_19074 entries ()Ljava/util/stream/Stream; METHOD method_20651 decay ()V + METHOD method_35120 getEntityReputationAssociatedGossips ()Ljava/util/Map; + METHOD method_35123 (Ljava/util/Map;Ljava/util/UUID;)V + ARG 2 uuid CLASS class_4137 Reputation FIELD field_18420 associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_19079 entriesFor (Ljava/util/UUID;)Ljava/util/stream/Stream;