From 805396c016163915bfd1564a697d3fbd40fb5ce6 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 4 Dec 2019 17:00:17 -0600 Subject: [PATCH] 1.15 pre4 1 (#994) * Some missing fields Signed-off-by: liach * Few more stuff Signed-off-by: liach * Remove problematic jd info --- .../net/minecraft/client/MinecraftClient.mapping | 2 ++ .../net/minecraft/client/render/Camera.mapping | 2 ++ .../minecraft/client/render/GameRenderer.mapping | 1 + .../minecraft/client/render/WorldRenderer.mapping | 15 +++++++++++---- .../render/entity/EntityRenderDispatcher.mapping | 7 +++++++ .../entity/ExperienceOrbEntityRenderer.mapping | 1 + .../net/minecraft/util/math/MathHelper.mapping | 6 ++++++ .../net/minecraft/util/math/Quaternion.mapping | 3 +++ 8 files changed, 33 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 61a6c43fbb..04e0e121bb 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -90,6 +90,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_18173 statusEffectSpriteManager Lnet/minecraft/class_4074; FIELD field_18174 resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18175 overlay Lnet/minecraft/class_4071; + FIELD field_20907 debugChunkInfo Z + FIELD field_20908 debugChunkOcculsion Z FIELD field_20909 bufferBuilders Lnet/minecraft/class_4599; METHOD (Lnet/minecraft/class_542;)V ARG 1 args diff --git a/mappings/net/minecraft/client/render/Camera.mapping b/mappings/net/minecraft/client/render/Camera.mapping index fc2f76d852..c9c6299eca 100644 --- a/mappings/net/minecraft/client/render/Camera.mapping +++ b/mappings/net/minecraft/client/render/Camera.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera FIELD field_18720 inverseView Z FIELD field_18721 cameraY F FIELD field_18722 lastCameraY F + FIELD field_21518 rotation Lnet/minecraft/class_1158; METHOD method_19317 updateEyeHeight ()V METHOD method_19318 clipToSpace (D)D ARG 1 desiredCameraDistance @@ -46,3 +47,4 @@ CLASS net/minecraft/class_4184 net/minecraft/client/render/Camera METHOD method_19335 getHorizontalPlane ()Lnet/minecraft/class_1160; METHOD method_19336 getVerticalPlane ()Lnet/minecraft/class_1160; METHOD method_19337 reset ()V + METHOD method_23767 getRotation ()Lnet/minecraft/class_1158; diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 309745af03..b5a6cc3950 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -36,6 +36,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 client METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; + METHOD method_22975 getOverlayTexture ()Lnet/minecraft/class_4608; METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V METHOD method_3169 onResized (II)V diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 74aa607973..9df1208e84 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer + FIELD field_20791 vertexFormat Lnet/minecraft/class_293; FIELD field_20792 frame I FIELD field_20797 RAIN Lnet/minecraft/class_2960; FIELD field_20798 SNOW Lnet/minecraft/class_2960; @@ -119,6 +120,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 20 blue METHOD method_22982 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_238;FFFF)V METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V + METHOD method_22989 renderChunkDebugInfo (Lnet/minecraft/class_4184;)V + ARG 1 camera METHOD method_22990 getEntityOutlinesFramebuffer ()Lnet/minecraft/class_276; METHOD method_23793 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I ARG 0 view @@ -286,13 +289,17 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 y ARG 3 z CLASS class_762 ChunkInfo + FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; FIELD field_4125 direction Lnet/minecraft/class_2350; + FIELD field_4126 cullingState B METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;I)V ARG 1 renderer ARG 2 chunk ARG 3 direction - METHOD method_3298 (Lnet/minecraft/class_2350;)Z - ARG 1 direction - METHOD method_3299 (BLnet/minecraft/class_2350;)V - ARG 2 direction + ARG 4 propagationLevel + METHOD method_3298 canCull (Lnet/minecraft/class_2350;)Z + ARG 1 from + METHOD method_3299 updateCullingState (BLnet/minecraft/class_2350;)V + ARG 1 parentCullingState + ARG 2 from diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index b0ea1d0075..67a5f947be 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDispatcher FIELD field_21009 SHADOW_LAYER Lnet/minecraft/class_1921; + FIELD field_21794 rotation Lnet/minecraft/class_1158; FIELD field_4678 targetedEntity Lnet/minecraft/class_1297; FIELD field_4680 renderHitboxes Z FIELD field_4681 renderShadows Z @@ -56,9 +57,15 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_23839 getLight (Lnet/minecraft/class_1297;F)I ARG 1 entity ARG 2 tickDelta + METHOD method_24196 setRotation (Lnet/minecraft/class_1158;)V + ARG 1 rotation + METHOD method_24197 getRotation ()Lnet/minecraft/class_1158; METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V ARG 1 world + ARG 2 camera + ARG 3 targetedEntity METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_3948 setRenderShadows (Z)V ARG 1 value METHOD method_3949 getTextRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping index ffe1df7cdb..0311d8f522 100644 --- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEntityRenderer + FIELD field_21741 TEXTURE_LAYER Lnet/minecraft/class_1921; FIELD field_4701 SKIN Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 6d4e7b8f78..6191b6094d 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -148,7 +148,13 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_20390 approximatelyEquals (DD)Z ARG 0 a ARG 2 b + METHOD method_22450 fractionalPart (F)F + ARG 0 value METHOD method_22858 fastInverseSqrt (F)F ARG 0 x METHOD method_23278 fastInverseCbrt (F)F ARG 0 x + METHOD method_24156 clamp (JJJ)J + ARG 0 value + ARG 2 min + ARG 4 max diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 9f7d02a813..2090e966c3 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; + FIELD field_21582 b F + FIELD field_21583 c F + FIELD field_21584 d F FIELD field_21585 a F METHOD (FFFF)V ARG 1 b