From 4e34f949a489bb3a7e54f759398314e4a8f10087 Mon Sep 17 00:00:00 2001 From: Chloe Dawn Date: Mon, 3 Jun 2019 17:42:57 +0100 Subject: [PATCH] Refactor properties (#716) --- .../state/property/AbstractProperty.mapping | 5 ++- .../state/property/BooleanProperty.mapping | 4 +- .../state/property/DirectionProperty.mapping | 8 ++-- .../state/property/EnumProperty.mapping | 25 +++++------ .../state/property/IntProperty.mapping | 12 ++++++ .../state/property/IntegerProperty.mapping | 11 ----- .../state/property/Properties.mapping | 42 ++++++++++--------- .../minecraft/state/property/Property.mapping | 6 ++- 8 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 mappings/net/minecraft/state/property/IntProperty.mapping delete mode 100644 mappings/net/minecraft/state/property/IntegerProperty.mapping diff --git a/mappings/net/minecraft/state/property/AbstractProperty.mapping b/mappings/net/minecraft/state/property/AbstractProperty.mapping index add74878bb..769f9a247e 100644 --- a/mappings/net/minecraft/state/property/AbstractProperty.mapping +++ b/mappings/net/minecraft/state/property/AbstractProperty.mapping @@ -1,9 +1,10 @@ CLASS bvw net/minecraft/state/property/AbstractProperty - FIELD a valueClass Ljava/lang/Class; + FIELD a type Ljava/lang/Class; FIELD b name Ljava/lang/String; FIELD c computedHashCode Ljava/lang/Integer; METHOD (Ljava/lang/String;Ljava/lang/Class;)V ARG 1 name + ARG 2 type METHOD c computeHashCode ()I METHOD equals (Ljava/lang/Object;)Z - ARG 1 o + ARG 1 obj diff --git a/mappings/net/minecraft/state/property/BooleanProperty.mapping b/mappings/net/minecraft/state/property/BooleanProperty.mapping index ed9b1f6824..4e9c104958 100644 --- a/mappings/net/minecraft/state/property/BooleanProperty.mapping +++ b/mappings/net/minecraft/state/property/BooleanProperty.mapping @@ -1,6 +1,8 @@ CLASS bwc net/minecraft/state/property/BooleanProperty FIELD a values Lcom/google/common/collect/ImmutableSet; - METHOD a create (Ljava/lang/String;)Lbwc; + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD a of (Ljava/lang/String;)Lbwc; ARG 0 name METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/state/property/DirectionProperty.mapping b/mappings/net/minecraft/state/property/DirectionProperty.mapping index e7e3eecc5d..5df77514ae 100644 --- a/mappings/net/minecraft/state/property/DirectionProperty.mapping +++ b/mappings/net/minecraft/state/property/DirectionProperty.mapping @@ -2,12 +2,12 @@ CLASS bwf 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;)Lbwf; + METHOD a of (Ljava/lang/String;Ljava/util/Collection;)Lbwf; ARG 0 name ARG 1 values - METHOD a create (Ljava/lang/String;Ljava/util/function/Predicate;)Lbwf; + METHOD a of (Ljava/lang/String;Ljava/util/function/Predicate;)Lbwf; ARG 0 name - ARG 1 predicate - METHOD a create (Ljava/lang/String;[Lfa;)Lbwf; + ARG 1 filter + METHOD a of (Ljava/lang/String;[Lfa;)Lbwf; ARG 0 name ARG 1 values diff --git a/mappings/net/minecraft/state/property/EnumProperty.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping index fdf16fef57..c528769c38 100644 --- a/mappings/net/minecraft/state/property/EnumProperty.mapping +++ b/mappings/net/minecraft/state/property/EnumProperty.mapping @@ -1,23 +1,24 @@ CLASS bwi net/minecraft/state/property/EnumProperty FIELD a values Lcom/google/common/collect/ImmutableSet; - FIELD b valuesByName Ljava/util/Map; + FIELD b byName Ljava/util/Map; METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V - ARG 2 valueClass + ARG 1 name + ARG 2 type ARG 3 values - METHOD a create (Ljava/lang/String;Ljava/lang/Class;)Lbwi; + METHOD a of (Ljava/lang/String;Ljava/lang/Class;)Lbwi; ARG 0 name - ARG 1 valueClass - METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbwi; + ARG 1 type + METHOD a of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbwi; ARG 0 name - ARG 1 valueClass - ARG 2 validValues - METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbwi; + ARG 1 type + ARG 2 values + METHOD a of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbwi; ARG 0 name - ARG 1 valueClass - ARG 2 predicate - METHOD a create (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbwi; + ARG 1 type + ARG 2 filter + METHOD a of (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbwi; ARG 0 name - ARG 1 valueClass + ARG 1 type ARG 2 values METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/state/property/IntProperty.mapping b/mappings/net/minecraft/state/property/IntProperty.mapping new file mode 100644 index 0000000000..1aab3049fb --- /dev/null +++ b/mappings/net/minecraft/state/property/IntProperty.mapping @@ -0,0 +1,12 @@ +CLASS bwk net/minecraft/state/property/IntProperty + FIELD a values Lcom/google/common/collect/ImmutableSet; + METHOD (Ljava/lang/String;II)V + ARG 1 name + ARG 2 min + ARG 3 max + METHOD a of (Ljava/lang/String;II)Lbwk; + ARG 0 name + ARG 1 min + ARG 2 max + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o diff --git a/mappings/net/minecraft/state/property/IntegerProperty.mapping b/mappings/net/minecraft/state/property/IntegerProperty.mapping deleted file mode 100644 index b09d4d6621..0000000000 --- a/mappings/net/minecraft/state/property/IntegerProperty.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS bwk net/minecraft/state/property/IntegerProperty - FIELD a validValues Lcom/google/common/collect/ImmutableSet; - METHOD (Ljava/lang/String;II)V - ARG 1 name - ARG 2 min - METHOD a create (Ljava/lang/String;II)Lbwk; - ARG 0 name - ARG 1 min - ARG 2 max - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index a17ee76654..f4ac01e171 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -2,23 +2,23 @@ CLASS bwb net/minecraft/state/property/Properties FIELD A TRIGGERED Lbwc; FIELD B UNSTABLE Lbwc; FIELD C WATERLOGGED Lbwc; - FIELD D AXIS_XZ Lbwi; - FIELD E AXIS_XYZ Lbwi; - FIELD F UP_BOOL Lbwc; - FIELD G DOWN_BOOL Lbwc; - FIELD H NORTH_BOOL Lbwc; - FIELD I EAST_BOOL Lbwc; - FIELD J SOUTH_BOOL Lbwc; - FIELD K WEST_BOOL Lbwc; + FIELD D HORIZONTAL_AXIS Lbwi; + FIELD E AXIS Lbwi; + FIELD F UP Lbwc; + FIELD G DOWN Lbwc; + FIELD H NORTH Lbwc; + FIELD I EAST Lbwc; + FIELD J SOUTH Lbwc; + FIELD K WEST Lbwc; FIELD L FACING Lbwf; FIELD M HOPPER_FACING Lbwf; - FIELD N FACING_HORIZONTAL Lbwf; + FIELD N HORIZONTAL_FACING Lbwf; FIELD O WALL_MOUNT_LOCATION Lbwi; FIELD P ATTACHMENT Lbwi; - FIELD Q WIRE_CONNECTION_EAST Lbwi; - FIELD R WIRE_CONNECTION_NORTH Lbwi; - FIELD S WIRE_CONNECTION_SOUTH Lbwi; - FIELD T WIRE_CONNECTION_WEST Lbwi; + FIELD Q EAST_WIRE_CONNECTION Lbwi; + FIELD R NORTH_WIRE_CONNECTION Lbwi; + FIELD S SOUTH_WIRE_CONNECTION Lbwi; + FIELD T WEST_WIRE_CONNECTION Lbwi; FIELD U DOUBLE_BLOCK_HALF Lbwi; FIELD V BLOCK_HALF Lbwi; FIELD W RAIL_SHAPE Lbwi; @@ -43,17 +43,17 @@ CLASS bwb net/minecraft/state/property/Properties FIELD ai EGGS Lbwk; FIELD aj HATCH Lbwk; FIELD ak LAYERS Lbwk; - FIELD al CAULDRON_LEVEL Lbwk; - FIELD am COMPOSTER_LEVEL Lbwk; - FIELD an FLUID_LEVEL Lbwk; - FIELD ao FLUID_BLOCK_LEVEL Lbwk; + FIELD al LEVEL_3 Lbwk; + FIELD am LEVEL_8 Lbwk; + FIELD an LEVEL_1_8 Lbwk; + FIELD ao LEVEL_15 Lbwk; FIELD ap MOISTURE Lbwk; FIELD aq NOTE Lbwk; FIELD ar PICKLES Lbwk; FIELD as POWER Lbwk; - FIELD at SAPLING_STAGE Lbwk; + FIELD at STAGE Lbwk; FIELD au DISTANCE_0_7 Lbwk; - FIELD av ROTATION_16 Lbwk; + FIELD av ROTATION Lbwk; FIELD aw BED_PART Lbwi; FIELD ax CHEST_TYPE Lbwi; FIELD ay COMPARATOR_MODE Lbwi; @@ -83,3 +83,7 @@ CLASS bwb net/minecraft/state/property/Properties FIELD x SHORT Lbwc; FIELD y SIGNAL_FIRE Lbwc; FIELD z SNOWY Lbwc; + METHOD a (Lbwo;)Z + ARG 0 shape + METHOD a (Lfa;)Z + ARG 0 facing diff --git a/mappings/net/minecraft/state/property/Property.mapping b/mappings/net/minecraft/state/property/Property.mapping index f18a4403ac..f8c81b2dd7 100644 --- a/mappings/net/minecraft/state/property/Property.mapping +++ b/mappings/net/minecraft/state/property/Property.mapping @@ -1,6 +1,8 @@ CLASS bwn net/minecraft/state/property/Property METHOD a getName ()Ljava/lang/String; - METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; - METHOD b getValueClass ()Ljava/lang/Class; + METHOD a getName (Ljava/lang/Comparable;)Ljava/lang/String; + ARG 1 value + METHOD b getValueType ()Ljava/lang/Class; METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; + ARG 1 name METHOD d getValues ()Ljava/util/Collection;