From 70b1474a328fb55a58d168e8803d414eb000a543 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Wed, 29 Jul 2020 02:40:12 +0200 Subject: [PATCH] Random client mappings (#1616) * Random client mappings * Update MinecraftClient.mapping * Update gradle.properties --- gradle.properties | 4 ++-- .../minecraft/client/MinecraftClient.mapping | 19 ++++++++++++++++++- mappings/net/minecraft/client/RunArgs.mapping | 2 ++ .../client/gui/hud/BossBarHud.mapping | 7 ++++++- .../minecraft/client/gui/hud/ChatHud.mapping | 5 +++++ .../client/gui/hud/ChatHudLine.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 3 +++ .../client/gui/hud/InGameHud.mapping | 18 ++++++++++++++++-- .../client/gui/hud/SubtitlesHud.mapping | 1 + .../entity/LivingEntityRenderer.mapping | 1 + 10 files changed, 55 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 772c70ea1f..eb30ee3946 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.20+build.206 -stitch_version=0.5.1+build.77 \ No newline at end of file +enigma_version=0.21+build.213 +stitch_version=0.5.1+build.77 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index fd1c7fb93a..56e4a92e0b 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -116,8 +116,11 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759; METHOD method_1490 stop ()V METHOD method_1492 drawProfilerResults (Lnet/minecraft/class_4587;Lnet/minecraft/class_3696;)V + ARG 1 matrices + ARG 2 profileResult METHOD method_1493 isPaused ()Z METHOD method_1494 setCrashReport (Lnet/minecraft/class_128;)V + ARG 1 report METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_1496 isIntegratedServerRunning ()Z METHOD method_1498 isHudEnabled ()Z @@ -165,16 +168,18 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1547 getVersionType ()Ljava/lang/String; METHOD method_1548 getSession ()Lnet/minecraft/class_320; METHOD method_1549 getSpriteAtlas (Lnet/minecraft/class_2960;)Ljava/util/function/Function; + ARG 1 id METHOD method_1551 getInstance ()Lnet/minecraft/class_310; METHOD method_1552 getSnooper ()Lnet/minecraft/class_1276; METHOD method_1554 getBakedModelManager ()Lnet/minecraft/class_1092; METHOD method_1555 hasReducedDebugInfo ()Z METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; - METHOD method_1561 getEntityRenderManager ()Lnet/minecraft/class_898; + METHOD method_1561 getEntityRenderDispatcher ()Lnet/minecraft/class_898; METHOD method_1562 getNetworkHandler ()Lnet/minecraft/class_634; METHOD method_1563 getCurrentAction ()Ljava/lang/String; METHOD method_1565 printCrashReport (Lnet/minecraft/class_128;)V + ARG 0 report METHOD method_1566 getToastManager ()Lnet/minecraft/class_374; METHOD method_1569 isWindowFocused ()Z METHOD method_1570 getMetricsData ()Lnet/minecraft/class_3517; @@ -225,10 +230,19 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599; METHOD method_24038 createResourcePackProfile (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; + ARG 0 name + ARG 1 alwaysEnabled + ARG 2 packFactory + ARG 3 pack + ARG 4 metadata + ARG 5 insertionPosition + ARG 6 source METHOD method_24041 resetMipmapLevels (I)V ARG 1 mipmapLevels METHOD method_24042 createV3ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 packFactory METHOD method_24043 createV4ResourcePackFactory (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 packFactory METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V ARG 1 throwable METHOD method_24287 getWindowTitle ()Ljava/lang/String; @@ -244,6 +258,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24460 endMonitor (ZLnet/minecraft/class_4758;)V ARG 1 active ARG 2 monitor + METHOD method_27022 hasOutline (Lnet/minecraft/class_1297;)Z + COMMENT Checks if the provided {@code entity} should display an outline around its model. + ARG 1 entity METHOD method_27466 initFont (Z)V ARG 1 forcesUnicode METHOD method_29042 shouldBlockMessages (Ljava/util/UUID;)Z diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index dcb0f43a93..87d5a95406 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -42,8 +42,10 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; FIELD field_3297 profileProperties Lcom/mojang/authlib/properties/PropertyMap; + FIELD field_3298 userProperties Lcom/mojang/authlib/properties/PropertyMap; FIELD field_3299 session Lnet/minecraft/class_320; METHOD (Lnet/minecraft/class_320;Lcom/mojang/authlib/properties/PropertyMap;Lcom/mojang/authlib/properties/PropertyMap;Ljava/net/Proxy;)V ARG 1 session + ARG 2 userProperties ARG 3 profileProperties ARG 4 proxy diff --git a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping index c7d5bc0602..c97e652d92 100644 --- a/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/BossBarHud.mapping @@ -1,14 +1,19 @@ CLASS net/minecraft/class_337 net/minecraft/client/gui/hud/BossBarHud FIELD field_2058 client Lnet/minecraft/class_310; - FIELD field_2059 BAR_TEX Lnet/minecraft/class_2960; + FIELD field_2059 BARS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2060 bossBars Ljava/util/Map; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1795 handlePacket (Lnet/minecraft/class_2629;)V ARG 1 packet METHOD method_1796 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1797 shouldDarkenSky ()Z METHOD method_1798 shouldPlayDragonMusic ()Z METHOD method_1799 renderBossBar (Lnet/minecraft/class_4587;IILnet/minecraft/class_1259;)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 bossBar METHOD method_1800 shouldThickenFog ()Z METHOD method_1801 clear ()V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 86d6760053..0159e97db1 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_2065 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_2066 scrolledLines I FIELD field_2067 hasUnreadNewMessages Z + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1802 scroll (D)V ARG 1 amount METHOD method_1803 addToMessageHistory (Ljava/lang/String;)V @@ -14,6 +16,8 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message ARG 2 messageId METHOD method_1805 render (Lnet/minecraft/class_4587;I)V + ARG 1 matrices + ARG 2 tickDelta METHOD method_1806 getWidth (D)I ARG 0 widthOption METHOD method_1807 removeMessage (I)V @@ -40,3 +44,4 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud METHOD method_1820 resetScroll ()V METHOD method_19348 getMessageOpacityMultiplier (I)D ARG 0 age + METHOD method_23677 isChatHidden ()Z diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index 46df6bcf1c..a7d4b2cd9e 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine FIELD field_1651 text Ljava/lang/Object; METHOD (ILjava/lang/Object;I)V ARG 1 creationTick + ARG 2 text ARG 3 id METHOD method_1412 getText ()Ljava/lang/Object; METHOD method_1413 getId ()I diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 1d7610b040..bc489d3242 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -30,6 +30,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry METHOD method_1846 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1847 renderLeftText (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1848 renderRightText (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_20603 getServerWorld ()Lnet/minecraft/class_3218; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 6fa34ecb72..068726ef68 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2017 titleRemainTicks I FIELD field_2018 overlayMessage Lnet/minecraft/class_2561; FIELD field_2019 PUMPKIN_BLUR Lnet/minecraft/class_2960; - FIELD field_2020 VIGNETTE_TEX Lnet/minecraft/class_2960; + FIELD field_2020 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; FIELD field_2022 listeners Ljava/util/Map; FIELD field_2023 titleTotalTicks I @@ -16,7 +16,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2025 spectatorHud Lnet/minecraft/class_365; FIELD field_2026 debugHud Lnet/minecraft/class_340; FIELD field_2027 subtitlesHud Lnet/minecraft/class_359; - FIELD field_2028 WIDGETS_TEX Lnet/minecraft/class_2960; + FIELD field_2028 WIDGETS_TEXTURE Lnet/minecraft/class_2960; FIELD field_2029 scaledHeight I FIELD field_2030 bossBarHud Lnet/minecraft/class_337; FIELD field_2031 currentStack Lnet/minecraft/class_1799; @@ -31,6 +31,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2040 heldItemTooltipFade I FIELD field_2041 overlayRemaining I FIELD field_2042 ticks I + FIELD field_26527 DEMO_EXPIRED_MESSAGE Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V @@ -40,12 +41,15 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; METHOD method_1738 getTicks ()I METHOD method_1739 getSpectatorHud ()Lnet/minecraft/class_365; METHOD method_1740 getBossBarHud ()Lnet/minecraft/class_337; METHOD method_1741 renderMountHealth (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1742 setDefaultTitleFade ()V METHOD method_1743 getChatHud ()Lnet/minecraft/class_338; METHOD method_1744 getHeartCount (Lnet/minecraft/class_1309;)I @@ -57,23 +61,33 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V METHOD method_1750 getPlayerListWidget ()Lnet/minecraft/class_355; METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_4587;I)V + ARG 1 matrices + ARG 2 x METHOD method_1753 render (Lnet/minecraft/class_4587;F)V METHOD method_17534 shouldRenderSpectatorCrosshair (Lnet/minecraft/class_239;)Z + ARG 1 hitResult METHOD method_1754 renderExperienceBar (Lnet/minecraft/class_4587;I)V + ARG 1 matrices + ARG 2 x METHOD method_1755 addChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Ljava/util/UUID;)V ARG 1 type ARG 2 text ARG 3 senderUuid METHOD method_1756 getFontRenderer ()Lnet/minecraft/class_327; METHOD method_1757 renderScoreboardSidebar (Lnet/minecraft/class_4587;Lnet/minecraft/class_266;)V + ARG 1 matrices + ARG 2 objective METHOD method_1758 setOverlayMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 tinted METHOD method_1759 renderHotbar (FLnet/minecraft/class_4587;)V METHOD method_1760 renderStatusBars (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1761 renderPumpkinOverlay ()V METHOD method_1762 renderHotbarItem (IIFLnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V METHOD method_1763 setTitles (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;III)V METHOD method_1765 renderStatusEffectOverlay (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1766 renderDemoTimer (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_19346 drawTextBackground (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;III)V diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index 453ce60c5a..36259dbe2d 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1957 render (Lnet/minecraft/class_4587;)V + ARG 1 matrices CLASS class_360 SubtitleEntry FIELD field_2185 time J FIELD field_2186 pos Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 22a8e777d5..72278d53d5 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen ARG 1 entity ARG 2 showBody ARG 3 translucent + ARG 4 showOutline METHOD method_25450 isShaking (Lnet/minecraft/class_1309;)Z COMMENT Returns if this entity is shaking in the way a zombie villager, COMMENT zombie, husk, or piglin undergoing conversion shakes.