From 4385959a967c74fade6b3493304bcff286e63c09 Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 10 Dec 2018 00:54:34 -0800 Subject: [PATCH] Facing -> Direction --- ...operty.mapping => DirectionProperty.mapping} | 9 +++++---- .../state/property/EnumProperty.mapping | 17 +++++++++++------ .../math/{Facing.mapping => Direction.mapping} | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) rename mappings/net/minecraft/state/property/{FacingProperty.mapping => DirectionProperty.mapping} (71%) rename mappings/net/minecraft/util/math/{Facing.mapping => Direction.mapping} (97%) diff --git a/mappings/net/minecraft/state/property/FacingProperty.mapping b/mappings/net/minecraft/state/property/DirectionProperty.mapping similarity index 71% rename from mappings/net/minecraft/state/property/FacingProperty.mapping rename to mappings/net/minecraft/state/property/DirectionProperty.mapping index 8cc3ae3695..9a895593f2 100644 --- a/mappings/net/minecraft/state/property/FacingProperty.mapping +++ b/mappings/net/minecraft/state/property/DirectionProperty.mapping @@ -1,12 +1,13 @@ -CLASS bpg net/minecraft/state/property/FacingProperty +CLASS bpg net/minecraft/state/property/DirectionProperty METHOD (Ljava/lang/String;Ljava/util/Collection;)V ARG 1 name + ARG 2 values METHOD a create (Ljava/lang/String;Ljava/util/Collection;)Lbpg; ARG 0 name - ARG 1 validValues + ARG 1 values METHOD a create (Ljava/lang/String;Ljava/util/function/Predicate;)Lbpg; ARG 0 name - ARG 1 valuePredicate + ARG 1 predicate METHOD a create (Ljava/lang/String;[Ley;)Lbpg; ARG 0 name - ARG 1 validValues + ARG 1 values diff --git a/mappings/net/minecraft/state/property/EnumProperty.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping index 339916c4c3..f33b695bcf 100644 --- a/mappings/net/minecraft/state/property/EnumProperty.mapping +++ b/mappings/net/minecraft/state/property/EnumProperty.mapping @@ -1,21 +1,26 @@ CLASS bpj net/minecraft/state/property/EnumProperty - FIELD a validValues Lcom/google/common/collect/ImmutableSet; - FIELD b nameValueMap Ljava/util/Map; + FIELD a values Lcom/google/common/collect/ImmutableSet; + FIELD b valuesByName Ljava/util/Map; METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V ARG 2 valueClass + ARG 3 values METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; METHOD a getValueAsString (Ljava/lang/Enum;)Ljava/lang/String; METHOD a create (Ljava/lang/String;Ljava/lang/Class;)Lbpj; ARG 0 name ARG 1 valueClass METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbpj; - ARG 1 valueClass - ARG 2 validValues - METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbpj; - METHOD a create (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbpj; ARG 0 name ARG 1 valueClass ARG 2 validValues + METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbpj; + ARG 0 name + ARG 1 valueClass + ARG 2 predicate + METHOD a create (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbpj; + ARG 0 name + ARG 1 valueClass + ARG 2 values METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; METHOD c computeHashCode ()I METHOD d getValues ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/util/math/Facing.mapping b/mappings/net/minecraft/util/math/Direction.mapping similarity index 97% rename from mappings/net/minecraft/util/math/Facing.mapping rename to mappings/net/minecraft/util/math/Direction.mapping index f576d68ff6..26c040f7bb 100644 --- a/mappings/net/minecraft/util/math/Facing.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -1,4 +1,4 @@ -CLASS ey net/minecraft/util/math/Facing +CLASS ey net/minecraft/util/math/Direction CLASS ey$a Axis CLASS ey$a$1 METHOD (Ljava/lang/String;ILjava/lang/String;)V @@ -58,7 +58,7 @@ CLASS ey net/minecraft/util/math/Facing METHOD b isVertical ()Z METHOD c isHorizontal ()Z METHOD m asString ()Ljava/lang/String; - CLASS ey$b Direction + CLASS ey$b AxisDirection FIELD a POSITIVE Ley$b; FIELD b NEGATIVE Ley$b; FIELD c offset I