From c785526e757c670a5c92f476c2f6d3f927a85280 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 1 Apr 2020 11:32:46 -0500 Subject: [PATCH] block bad names and glstatemanager bad stuff, rotation3 -> affine transformation (#1244) * block bad names and glstatemanager bad stuff, rotation3 -> affine transformation close #1224, close #1233, close #1234, close #1241 * Update mappings/com/mojang/blaze3d/platform/GlStateManager.mapping Co-Authored-By: Yanis48 Co-authored-by: liach Co-authored-by: Yanis48 --- .../mojang/blaze3d/platform/GlStateManager.mapping | 6 ++++-- mappings/net/minecraft/block/AbstractBlock.mapping | 11 ++++++----- mappings/net/minecraft/block/Block.mapping | 2 +- ...Rotation3.mapping => AffineTransformation.mapping} | 4 ++-- ...n3Helper.mapping => AffineTransformations.mapping} | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) rename mappings/net/minecraft/client/util/math/{Rotation3.mapping => AffineTransformation.mapping} (93%) rename mappings/net/minecraft/client/util/math/{Rotation3Helper.mapping => AffineTransformations.mapping} (83%) diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index b4e333d346..0085b45a20 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21912 disableTexture ()V METHOD method_21913 enableClientState (I)V ARG 0 cap - METHOD method_21914 getTexLevelParameter ()I + METHOD method_21914 genTextures ()I METHOD method_21920 enableRescaleNormal ()V METHOD method_21921 getString (I)Ljava/lang/String; ARG 0 name @@ -220,7 +220,7 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 1 internalFormat ARG 2 width ARG 3 height - METHOD method_21989 texEnv (ILjava/nio/FloatBuffer;)V + METHOD method_21989 getFloat (ILjava/nio/FloatBuffer;)V ARG 0 pname ARG 1 params METHOD method_21990 getUniformLocation (ILjava/lang/CharSequence;)I @@ -474,6 +474,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 1 source0Color METHOD method_23282 setupOutline ()V METHOD method_23283 teardownOutline ()V + METHOD method_24221 setupGuiFlatDiffuseLighting ()V + METHOD method_24222 setupGui3dDiffuseLighting ()V CLASS class_1010 FBOMode CLASS class_1016 AlphaTestState FIELD field_5042 capState Lnet/minecraft/class_4493$class_1018; diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index c595ea3c6a..c864dcc9ad 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26160 asBlock ()Lnet/minecraft/class_2248; METHOD method_26161 hasBlockEntity ()Z METHOD method_26162 getDropTableID ()Lnet/minecraft/class_2960; + METHOD method_26403 getDefaultMaterialColor ()Lnet/minecraft/class_3620; METHOD method_8389 asItem ()Lnet/minecraft/class_1792; METHOD method_9498 hasComparatorOutput (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -215,7 +216,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23183 suffocationPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23184 blockVisionPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23185 postProcessPredicate Lnet/minecraft/class_4970$class_4973; - FIELD field_23186 inWallOverlayPredicate Lnet/minecraft/class_4970$class_4973; + FIELD field_23186 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; METHOD (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V ARG 1 material ARG 2 materialColorFactory @@ -268,14 +269,14 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 0 state ARG 1 world ARG 2 pos - METHOD method_26249 inWallOverlay (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; + METHOD method_26249 emissiveLighting (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; ARG 1 predicate METHOD method_26250 air ()Lnet/minecraft/class_4970$class_2251; METHOD method_9617 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251; ARG 0 material ARG 1 color METHOD method_9618 breakInstantly ()Lnet/minecraft/class_4970$class_2251; - METHOD method_9624 hasDynamicBounds ()Lnet/minecraft/class_4970$class_2251; + METHOD method_9624 dynamicBounds ()Lnet/minecraft/class_4970$class_2251; METHOD method_9626 sounds (Lnet/minecraft/class_2498;)Lnet/minecraft/class_4970$class_2251; ARG 1 soundGroup METHOD method_9628 slipperiness (F)Lnet/minecraft/class_4970$class_2251; @@ -309,7 +310,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23175 suffocationPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23176 blockVisionPredicate Lnet/minecraft/class_4970$class_4973; FIELD field_23177 postProcessPredicate Lnet/minecraft/class_4970$class_4973; - FIELD field_23178 inWallOverlayPredicate Lnet/minecraft/class_4970$class_4973; + FIELD field_23178 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973; METHOD (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;)V ARG 1 block ARG 2 propertyMap @@ -466,7 +467,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 direction METHOD method_26207 getMaterial ()Lnet/minecraft/class_3614; - METHOD method_26208 hasInWallOverlay (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + METHOD method_26208 hasEmissiveLighting (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos METHOD method_26209 exceedsCube ()Z diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index dbb8fb10db..551bb0a176 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 pos METHOD method_9507 getRawIdFromState (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_9510 getRenderingState (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + METHOD method_9510 postProcessState (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/util/math/Rotation3.mapping b/mappings/net/minecraft/client/util/math/AffineTransformation.mapping similarity index 93% rename from mappings/net/minecraft/client/util/math/Rotation3.mapping rename to mappings/net/minecraft/client/util/math/AffineTransformation.mapping index d016dc3ce7..edcff5141e 100644 --- a/mappings/net/minecraft/client/util/math/Rotation3.mapping +++ b/mappings/net/minecraft/client/util/math/AffineTransformation.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4590 net/minecraft/client/util/math/Rotation3 +CLASS net/minecraft/class_4590 net/minecraft/client/util/math/AffineTransformation FIELD field_20900 matrix Lnet/minecraft/class_1159; FIELD field_20901 initialized Z FIELD field_20902 translation Lnet/minecraft/class_1160; @@ -7,7 +7,7 @@ CLASS net/minecraft/class_4590 net/minecraft/client/util/math/Rotation3 FIELD field_20905 rotation1 Lnet/minecraft/class_1158; FIELD field_20906 IDENTITY Lnet/minecraft/class_4590; METHOD (Lnet/minecraft/class_1159;)V - ARG 1 transformation + ARG 1 matrix METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;Lnet/minecraft/class_1160;Lnet/minecraft/class_1158;)V ARG 1 translation ARG 2 rotation2 diff --git a/mappings/net/minecraft/client/util/math/Rotation3Helper.mapping b/mappings/net/minecraft/client/util/math/AffineTransformations.mapping similarity index 83% rename from mappings/net/minecraft/client/util/math/Rotation3Helper.mapping rename to mappings/net/minecraft/client/util/math/AffineTransformations.mapping index 7e9e8f3ccd..60a536037a 100644 --- a/mappings/net/minecraft/client/util/math/Rotation3Helper.mapping +++ b/mappings/net/minecraft/client/util/math/AffineTransformations.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4609 net/minecraft/client/util/math/Rotation3Helper +CLASS net/minecraft/class_4609 net/minecraft/client/util/math/AffineTransformations FIELD field_21021 DIRECTION_ROTATIONS Ljava/util/EnumMap; FIELD field_21022 INVERSED_DIRECTION_ROTATIONS Ljava/util/EnumMap; FIELD field_21023 LOGGER Lorg/apache/logging/log4j/Logger;