From dfda2435aa0ca2f8707fa5a7d6ecb57b3e5546a9 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 15 Apr 2022 06:19:33 +0900 Subject: [PATCH] Fix several mapping bugs (#3074) Resolves #3043 Resolves #3057 Resolves #3066 --- mappings/net/minecraft/block/AbstractRailBlock.mapping | 6 +++--- mappings/net/minecraft/block/RailPlacementHelper.mapping | 2 +- .../minecraft/entity/vehicle/AbstractMinecartEntity.mapping | 2 +- mappings/net/minecraft/util/registry/RegistryEntry.mapping | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/block/AbstractRailBlock.mapping b/mappings/net/minecraft/block/AbstractRailBlock.mapping index 4612cfb6c5..f450909b8b 100644 --- a/mappings/net/minecraft/block/AbstractRailBlock.mapping +++ b/mappings/net/minecraft/block/AbstractRailBlock.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock FIELD field_27096 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_9958 STRAIGHT_SHAPE Lnet/minecraft/class_265; - FIELD field_9959 allowCurves Z + FIELD field_9959 forbidCurves Z FIELD field_9960 ASCENDING_SHAPE Lnet/minecraft/class_265; METHOD (ZLnet/minecraft/class_4970$class_2251;)V - ARG 1 allowCurves + ARG 1 forbidCurves ARG 2 settings METHOD method_24417 updateCurves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_2680; ARG 1 state @@ -33,7 +33,7 @@ CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock ARG 2 world ARG 3 pos ARG 4 neighbor - METHOD method_9478 canMakeCurves ()Z + METHOD method_9478 cannotMakeCurves ()Z METHOD method_9479 isRail (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/RailPlacementHelper.mapping b/mappings/net/minecraft/block/RailPlacementHelper.mapping index 19ce96fc7f..93ca39e7a8 100644 --- a/mappings/net/minecraft/block/RailPlacementHelper.mapping +++ b/mappings/net/minecraft/block/RailPlacementHelper.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2452 net/minecraft/block/RailPlacementHelper FIELD field_11406 state Lnet/minecraft/class_2680; FIELD field_11407 neighbors Ljava/util/List; - FIELD field_11408 allowCurves Z + FIELD field_11408 forbidCurves Z FIELD field_11409 world Lnet/minecraft/class_1937; FIELD field_11410 pos Lnet/minecraft/class_2338; FIELD field_11411 block Lnet/minecraft/class_2241; diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index b26a02bed8..39b38c03dd 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti ARG 0 map METHOD method_30340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 pos - METHOD method_7504 getMaxOffRailSpeed ()D + METHOD method_7504 getMaxSpeed ()D METHOD method_7505 snapPositionToRailWithOffset (DDDD)Lnet/minecraft/class_243; COMMENT This method is used to determine the minecart's render orientation, by computing a position along the rail slightly before and slightly after the minecart's actual position. ARG 1 x diff --git a/mappings/net/minecraft/util/registry/RegistryEntry.mapping b/mappings/net/minecraft/util/registry/RegistryEntry.mapping index b539f09196..d25498d4b1 100644 --- a/mappings/net/minecraft/util/registry/RegistryEntry.mapping +++ b/mappings/net/minecraft/util/registry/RegistryEntry.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_6880 net/minecraft/util/registry/RegistryEntry ARG 1 tag METHOD method_40221 upcast (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; ARG 0 entry - METHOD method_40222 setRegistry (Lnet/minecraft/class_2378;)Z + METHOD method_40222 matchesRegistry (Lnet/minecraft/class_2378;)Z ARG 1 registry METHOD method_40223 of (Ljava/lang/Object;)Lnet/minecraft/class_6880; ARG 0 value