From 13f75e45cdc8c8c54d84060aaee0065ac96a0cf7 Mon Sep 17 00:00:00 2001 From: zOnlyKroks Date: Fri, 10 Nov 2023 19:10:39 +0100 Subject: [PATCH] Fix and revert --- .../render/debug/BreezeDebugRenderer.mapping | 51 +++++++++---------- mappings/net/minecraft/nbt/NbtIo.mapping | 1 - .../net/minecraft/nbt/NbtIoWriteUtils.mapping | 34 ------------- 3 files changed, 23 insertions(+), 63 deletions(-) delete mode 100644 mappings/net/minecraft/nbt/NbtIoWriteUtils.mapping diff --git a/mappings/net/minecraft/client/render/debug/BreezeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BreezeDebugRenderer.mapping index d7c9f2c169..0d546fadfd 100644 --- a/mappings/net/minecraft/client/render/debug/BreezeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BreezeDebugRenderer.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_8985 net/minecraft/client/render/debug/BreezeDebugRend FIELD field_47468 ORANGE I FIELD field_47469 RED I FIELD field_47472 client Lnet/minecraft/class_310; - FIELD field_47473 breezeDebugInfoList Ljava/util/Map; + FIELD field_47473 breezes Ljava/util/Map; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_55255 clearMap ()V + METHOD method_55255 clear ()V METHOD method_55256 draw (ILorg/joml/Matrix4f;DDDLnet/minecraft/class_4588;Lnet/minecraft/class_243;FI)V ARG 0 vertex ARG 1 matrix4f @@ -18,36 +18,31 @@ CLASS net/minecraft/class_8985 net/minecraft/client/render/debug/BreezeDebugRend ARG 1 entity METHOD method_55258 (Lnet/minecraft/class_8949;)Z ARG 0 predicate - METHOD method_55259 renderOutlines (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V - ARG 1 stack - ARG 2 vertexConsumerProvider - ARG 3 x - ARG 5 y - ARG 7 z + METHOD method_55259 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ METHOD method_55260 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_8949;Lnet/minecraft/class_243;)V - ARG 9 entityVec3 + ARG 9 targetPos METHOD method_55261 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_8949;Lnet/minecraft/class_2338;)V ARG 9 targetVec4 - COMMENT targetVec4 - METHOD method_55262 constructVertex (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_243;Lnet/minecraft/class_243;I)V - ARG 0 stack - ARG 1 vertexConsumerProvider - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 vec3 - ARG 9 vec4 + COMMENT jumpTarget + METHOD method_55262 drawLine (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_243;Lnet/minecraft/class_243;I)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 cameraX + ARG 4 cameraY + ARG 6 cameraZ + ARG 8 entityPos + ARG 9 targetPos ARG 10 color METHOD method_55263 (Lnet/minecraft/class_746;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDDLnet/minecraft/class_8949;)V - ARG 10 breezeEntity - METHOD method_55264 (Lnet/minecraft/class_746;Ljava/lang/Integer;)Lnet/minecraft/class_1297; - ARG 1 breezeId - METHOD method_55265 renderBox (Lorg/joml/Matrix4f;DDDLnet/minecraft/class_4588;Lnet/minecraft/class_243;FI)V - ARG 0 stack - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 vertexConsumerProvider - ARG 8 entityBox + ARG 10 breeze + METHOD method_55265 drawMultiple (Lorg/joml/Matrix4f;DDDLnet/minecraft/class_4588;Lnet/minecraft/class_243;FI)V + ARG 0 matrix4f + ARG 7 vertexConsumer + ARG 8 targetPos METHOD method_55266 addBreezeDebugInfo (Lnet/minecraft/class_9004$class_9005;)V ARG 1 breezeDebugInfo diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 689f375c4d..5c7152a8de 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT A set of utility functions for reading, writing, and scanning NBT files. COMMENT Methods that do not require {@link NbtTagSizeTracker} accept any bytes of data, COMMENT provided that its depth does not exceed {@value NbtTagSizeTracker#DEFAULT_MAX_DEPTH}. - FIELD field_47513 openOptions [Ljava/nio/file/OpenOption; METHOD method_10625 readCompound (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT diff --git a/mappings/net/minecraft/nbt/NbtIoWriteUtils.mapping b/mappings/net/minecraft/nbt/NbtIoWriteUtils.mapping deleted file mode 100644 index f431c17c9a..0000000000 --- a/mappings/net/minecraft/nbt/NbtIoWriteUtils.mapping +++ /dev/null @@ -1,34 +0,0 @@ -CLASS net/minecraft/class_8941 net/minecraft/nbt/NbtIoWriteUtils - FIELD field_47218 output Ljava/io/DataOutput; - METHOD (Ljava/io/DataOutput;)V - ARG 1 output - METHOD write (I)V - ARG 1 value - METHOD write ([B)V - ARG 1 arr - METHOD write ([BII)V - ARG 1 arr - ARG 2 offset - ARG 3 length - METHOD writeBoolean (Z)V - ARG 1 value - METHOD writeByte (I)V - ARG 1 value - METHOD writeBytes (Ljava/lang/String;)V - ARG 1 byteString - METHOD writeChar (I)V - ARG 1 value - METHOD writeChars (Ljava/lang/String;)V - ARG 1 string - METHOD writeDouble (D)V - ARG 1 value - METHOD writeFloat (F)V - ARG 1 value - METHOD writeInt (I)V - ARG 1 value - METHOD writeLong (J)V - ARG 1 value - METHOD writeShort (I)V - ARG 1 value - METHOD writeUTF (Ljava/lang/String;)V - ARG 1 nbtString