From 4a7e783bfc5a1e5feef2d7f875b6e36e317cfc60 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Tue, 16 Jun 2020 07:41:09 -0400 Subject: [PATCH] Lots of 1.14.4 mappings (#1462) * My first mapping Signed-off-by: Reece Dunham * Rebase against liachmodded:1.15.2-2 Signed-off-by: Reece Dunham Co-authored-by: liach * Lots of 1.14.4 mappings Signed-off-by: Reece Dunham * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/block/entity/BellBlockEntity.mapping Co-authored-by: Yanis48 * Update mappings/net/minecraft/block/entity/BlockEntity.mapping Co-authored-by: Yanis48 * Update mappings/net/minecraft/util/hit/BlockHitResult.mapping Co-authored-by: Yanis48 * Update mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping Co-authored-by: Yanis48 * isShapeFullCube -> shapeIsFullCube * Change name to markedInvalid Co-authored-by: liach Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: Yanis48 --- .editorconfig | 6 +- .../net/minecraft/block/BlockState.mapping | 1 + .../minecraft/block/GrindstoneBlock.mapping | 64 +++++++++++++++++-- .../block/entity/BellBlockEntity.mapping | 3 + .../block/entity/BlockEntity.mapping | 2 + .../net/minecraft/client/gl/GlDebug.mapping | 3 + .../c2s/play/ClientSettingsC2SPacket.mapping | 2 + .../play/PlayerInteractBlockC2SPacket.mapping | 3 +- .../play/SelectVillagerTradeC2SPacket.mapping | 1 + .../minecraft/util/hit/BlockHitResult.mapping | 1 + 10 files changed, 77 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3e5f1504a6..cc2c3e68ef 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,3 @@ -[*.gradle] -indent_style = tab - -[*.java] +[*.{gradle,mapping}] indent_style = tab +indent_size = 4 diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 4dfa596461..aa58e1da5d 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState FIELD field_16560 shapes [Lnet/minecraft/class_265; FIELD field_19360 collisionShape Lnet/minecraft/class_265; FIELD field_19429 solidFullSquare [Z + FIELD field_20337 shapeIsFullCube Z METHOD (Lnet/minecraft/class_2680;)V ARG 1 state FIELD field_12290 shapeCache Lnet/minecraft/class_2680$class_3752; diff --git a/mappings/net/minecraft/block/GrindstoneBlock.mapping b/mappings/net/minecraft/block/GrindstoneBlock.mapping index a8f00a95ad..f62a9bef42 100644 --- a/mappings/net/minecraft/block/GrindstoneBlock.mapping +++ b/mappings/net/minecraft/block/GrindstoneBlock.mapping @@ -1,12 +1,68 @@ CLASS net/minecraft/class_3713 net/minecraft/block/GrindstoneBlock - FIELD field_16338 EAST_WEST_SHAPE Lnet/minecraft/class_265; + FIELD field_16338 X_FLOOR_SHAPE Lnet/minecraft/class_265; + FIELD field_16339 EAST_FLOOR_HINGE Lnet/minecraft/class_265; + FIELD field_16340 SOUTH_WALL_WEST_SIDE Lnet/minecraft/class_265; + FIELD field_16341 WEST_CEILING_LEG Lnet/minecraft/class_265; + FIELD field_16342 WEST_WALL_NORTH_LEG Lnet/minecraft/class_265; + FIELD field_16343 NORTH_FLOOR_HINGE Lnet/minecraft/class_265; + FIELD field_16344 WEST_WALL_SIDES Lnet/minecraft/class_265; + FIELD field_16345 EAST_WALL_NORTH_HINGE Lnet/minecraft/class_265; + FIELD field_16346 SOUTH_FLOOR_LEG Lnet/minecraft/class_265; + FIELD field_16347 NORTH_WALL_EAST_LEG Lnet/minecraft/class_265; + FIELD field_16348 WEST_FLOOR_SIDE Lnet/minecraft/class_265; + FIELD field_16349 EAST_CEILING_SIDE Lnet/minecraft/class_265; + FIELD field_16350 EAST_WALL_SOUTH_HINGE Lnet/minecraft/class_265; + FIELD field_16351 WEST_WALL_SOUTH_SIDE Lnet/minecraft/class_265; + FIELD field_16352 SOUTH_WALL_WEST_LEG Lnet/minecraft/class_265; + FIELD field_16353 SOUTH_CEILING_HINGE Lnet/minecraft/class_265; + FIELD field_16354 SOUTH_WALL_EAST_SIDE Lnet/minecraft/class_265; + FIELD field_16355 EAST_CEILING_LEG Lnet/minecraft/class_265; FIELD field_16356 NORTH_WALL_SHAPE Lnet/minecraft/class_265; - FIELD field_16361 NORTH_SOUTH_HANGING_SHAPE Lnet/minecraft/class_265; + FIELD field_16357 NORTH_CEILING_HINGE Lnet/minecraft/class_265; + FIELD field_16358 WEST_WALL_SOUTH_LEG Lnet/minecraft/class_265; + FIELD field_16359 WEST_WALL_NORTH_SIDE Lnet/minecraft/class_265; + FIELD field_16360 SOUTH_CEILING_SIDE Lnet/minecraft/class_265; + FIELD field_16361 Z_CEILING_SHAPE Lnet/minecraft/class_265; + FIELD field_16362 X_FLOOR_SIDES Lnet/minecraft/class_265; + FIELD field_16363 NORTH_WALL_WEST_LEG Lnet/minecraft/class_265; + FIELD field_16364 WEST_CEILING_SIDE Lnet/minecraft/class_265; + FIELD field_16365 EAST_FLOOR_SIDE Lnet/minecraft/class_265; + FIELD field_16366 WEST_FLOOR_HINGE Lnet/minecraft/class_265; + FIELD field_16367 NORTH_WALL_EAST_HINGE Lnet/minecraft/class_265; + FIELD field_16368 NORTH_WALL_SIDES Lnet/minecraft/class_265; + FIELD field_16369 SOUTH_WALL_SIDES Lnet/minecraft/class_265; FIELD field_16370 EAST_WALL_SHAPE Lnet/minecraft/class_265; + FIELD field_16371 SOUTH_WALL_EAST_HINGE Lnet/minecraft/class_265; + FIELD field_16372 EAST_WALL_NORTH_SIDE Lnet/minecraft/class_265; + FIELD field_16373 NORTH_FLOOR_LEG Lnet/minecraft/class_265; + FIELD field_16374 SOUTH_FLOOR_HINGE Lnet/minecraft/class_265; + FIELD field_16375 EAST_WALL_SOUTH_LEG Lnet/minecraft/class_265; FIELD field_16376 WEST_WALL_SHAPE Lnet/minecraft/class_265; - FIELD field_16380 NORTH_SOUTH_SHAPE Lnet/minecraft/class_265; - FIELD field_16383 EAST_WEST_HANGING_SHAPE Lnet/minecraft/class_265; + FIELD field_16377 SOUTH_WALL_EAST_LEG Lnet/minecraft/class_265; + FIELD field_16378 SOUTH_FLOOR_SIDE Lnet/minecraft/class_265; + FIELD field_16379 WEST_FLOOR_LEG Lnet/minecraft/class_265; + FIELD field_16380 Z_FLOOR_SHAPE Lnet/minecraft/class_265; + FIELD field_16381 EAST_WALL_SOUTH_SIDE Lnet/minecraft/class_265; + FIELD field_16382 WEST_WALL_SOUTH_HINGE Lnet/minecraft/class_265; + FIELD field_16383 X_CEILING_SHAPE Lnet/minecraft/class_265; + FIELD field_16384 WEST_CEILING_HINGE Lnet/minecraft/class_265; + FIELD field_16385 Z_FLOOR_SIDES Lnet/minecraft/class_265; + FIELD field_16386 NORTH_FLOOR_SIDE Lnet/minecraft/class_265; + FIELD field_16387 NORTH_CEILING_LEG Lnet/minecraft/class_265; + FIELD field_16388 NORTH_WALL_WEST_SIDE Lnet/minecraft/class_265; + FIELD field_16389 X_CEILING_SIDES Lnet/minecraft/class_265; + FIELD field_16390 WEST_WALL_NORTH_HINGE Lnet/minecraft/class_265; + FIELD field_16391 EAST_WALL_SIDES Lnet/minecraft/class_265; + FIELD field_16392 EAST_FLOOR_LEG Lnet/minecraft/class_265; + FIELD field_16393 SOUTH_WALL_WEST_HINGE Lnet/minecraft/class_265; + FIELD field_16394 EAST_WALL_NORTH_LEG Lnet/minecraft/class_265; + FIELD field_16395 NORTH_CEILING_SIDE Lnet/minecraft/class_265; + FIELD field_16396 NORTH_WALL_EAST_SIDE Lnet/minecraft/class_265; + FIELD field_16397 Z_CEILING_SIDES Lnet/minecraft/class_265; + FIELD field_16398 SOUTH_CEILING_LEG Lnet/minecraft/class_265; FIELD field_16399 SOUTH_WALL_SHAPE Lnet/minecraft/class_265; + FIELD field_16400 EAST_CEILING_HINGE Lnet/minecraft/class_265; + FIELD field_16401 NORTH_WALL_WEST_HINGE Lnet/minecraft/class_265; FIELD field_17364 CONTAINER_NAME Lnet/minecraft/class_2588; METHOD (Lnet/minecraft/class_2248$class_2251;)V ARG 1 settings diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index bef2494677..14b847270a 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -3,4 +3,7 @@ CLASS net/minecraft/class_3721 net/minecraft/block/entity/BellBlockEntity FIELD field_17096 isRinging Z FIELD field_17097 lastSideHit Lnet/minecraft/class_2350; METHOD method_17031 activate (Lnet/minecraft/class_2350;)V + METHOD method_20219 notifyMemoriesOfBell ()V + METHOD method_20518 isRaiderEntity (Lnet/minecraft/class_1309;)Z + METHOD method_20520 glowEntity (Lnet/minecraft/class_1309;)V METHOD method_20522 playResonateSound ()V diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 28b116580d..66f297f597 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity FIELD field_11866 cachedState Lnet/minecraft/class_2680; FIELD field_11867 pos Lnet/minecraft/class_2338; FIELD field_11868 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_19314 markedInvalid Z METHOD (Lnet/minecraft/class_2591;)V ARG 1 type METHOD method_10996 cancelRemoval ()V @@ -36,4 +37,5 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11017 getType ()Lnet/minecraft/class_2591; METHOD method_16886 toUpdatePacket ()Lnet/minecraft/class_2622; METHOD method_16887 toInitialChunkDataTag ()Lnet/minecraft/class_2487; + METHOD method_20525 markInvalid ()V METHOD method_5431 markDirty ()V diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index b078d529d1..b3573f84b2 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug FIELD field_4915 KHR_VERBOSITY_LEVELS Ljava/util/List; + FIELD field_4916 floatBuffer Ljava/nio/FloatBuffer; + FIELD field_4917 intBuffer Ljava/nio/IntBuffer; FIELD field_4918 SEMICOLON_JOINER Lcom/google/common/base/Joiner; FIELD field_4919 ARB_VERBOSITY_LEVELS Ljava/util/List; FIELD field_4920 NEWLINE_JOINER Lcom/google/common/base/Joiner; FIELD field_4921 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_4922 CONSTANTS Ljava/util/Map; + FIELD field_4924 byteBuffer Ljava/nio/ByteBuffer; METHOD method_4222 getSource (I)Ljava/lang/String; ARG 0 opcode METHOD method_4223 registerConstant (ILjava/lang/String;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping index 3c75503913..fc238b619a 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket FIELD field_12777 language Ljava/lang/String; FIELD field_12778 playerModelBitMask I + FIELD field_12779 chatColors Z FIELD field_12780 viewDistance I FIELD field_12781 chatVisibility Lnet/minecraft/class_1659; FIELD field_12782 mainArm Lnet/minecraft/class_1306; @@ -14,4 +15,5 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSetti METHOD method_12131 getLanguage ()Ljava/lang/String; METHOD method_12132 getMainArm ()Lnet/minecraft/class_1306; METHOD method_12134 getChatVisibility ()Lnet/minecraft/class_1659; + METHOD method_12135 hasChatColors ()Z METHOD method_12136 getPlayerModelBitMask ()I diff --git a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping index efe4c13865..c2ecac6ce8 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2885 net/minecraft/network/packet/c2s/play/PlayerInteractBlockC2SPacket FIELD field_13134 hand Lnet/minecraft/class_1268; - METHOD method_12543 getHitY ()Lnet/minecraft/class_3965; + FIELD field_17602 blockHitResult Lnet/minecraft/class_3965; + METHOD method_12543 getBlockHitResult ()Lnet/minecraft/class_3965; METHOD method_12546 getHand ()Lnet/minecraft/class_1268; diff --git a/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping index 2ad539e668..7c04d95786 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket FIELD field_13036 tradeId I + METHOD method_12431 getTradeId ()I diff --git a/mappings/net/minecraft/util/hit/BlockHitResult.mapping b/mappings/net/minecraft/util/hit/BlockHitResult.mapping index 4784b93db9..dd1d11f17e 100644 --- a/mappings/net/minecraft/util/hit/BlockHitResult.mapping +++ b/mappings/net/minecraft/util/hit/BlockHitResult.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_3965 net/minecraft/util/hit/BlockHitResult FIELD field_17588 side Lnet/minecraft/class_2350; FIELD field_17589 blockPos Lnet/minecraft/class_2338; FIELD field_17590 missed Z + FIELD field_17591 insideBlock Z METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Z)V ARG 1 pos ARG 2 side