From 9a6a13a6e89082ff08abcfff2afeb4d66796a300 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 28 Nov 2018 08:42:16 +0100 Subject: [PATCH] close #210, close #211, work on other things --- mappings/net/minecraft/entity/Entity.mapping | 4 ++-- ...ributeImpl.mapping => AbstractEntityAttribute.mapping} | 2 +- ...e.mapping => AbstractEntityAttributeContainer.mapping} | 2 +- ...aseEntity.mapping => AbstractDecorationEntity.mapping} | 3 ++- mappings/net/minecraft/entity/mob/SlimeEntity.mapping | 2 +- .../entity/parts/IEntityPartDamageDelegate.mapping | 2 +- ...keyBaseEntity.mapping => AbstractDonkeyEntity.mapping} | 2 +- .../passive/{EntityCat.mapping => CatEntity.mapping} | 2 +- .../{PropertyBase.mapping => AbstractProperty.mapping} | 2 +- .../{PropertyBoolean.mapping => BooleanProperty.mapping} | 2 +- .../{PropertyEnum.mapping => EnumProperty.mapping} | 2 +- .../{PropertyFacing.mapping => FacingProperty.mapping} | 2 +- .../{PropertyInteger.mapping => IntegerProperty.mapping} | 2 +- .../minecraft/util/json/EntityTypeJsonPredicate.mapping | 2 +- mappings/net/minecraft/util/registry/Registry.mapping | 2 +- mappings/net/minecraft/world/biome/Biome.mapping | 8 ++++---- 16 files changed, 21 insertions(+), 20 deletions(-) rename mappings/net/minecraft/entity/attribute/{EntityAttributeImpl.mapping => AbstractEntityAttribute.mapping} (78%) rename mappings/net/minecraft/entity/attribute/{EntityAttributeContainerBase.mapping => AbstractEntityAttributeContainer.mapping} (77%) rename mappings/net/minecraft/entity/decoration/{DecorationBaseEntity.mapping => AbstractDecorationEntity.mapping} (87%) rename mappings/net/minecraft/entity/passive/{DonkeyBaseEntity.mapping => AbstractDonkeyEntity.mapping} (84%) rename mappings/net/minecraft/entity/passive/{EntityCat.mapping => CatEntity.mapping} (94%) rename mappings/net/minecraft/state/property/{PropertyBase.mapping => AbstractProperty.mapping} (84%) rename mappings/net/minecraft/state/property/{PropertyBoolean.mapping => BooleanProperty.mapping} (87%) rename mappings/net/minecraft/state/property/{PropertyEnum.mapping => EnumProperty.mapping} (94%) rename mappings/net/minecraft/state/property/{PropertyFacing.mapping => FacingProperty.mapping} (86%) rename mappings/net/minecraft/state/property/{PropertyInteger.mapping => IntegerProperty.mapping} (89%) diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index d90558d302..9385f70105 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -36,7 +36,7 @@ CLASS agf net/minecraft/entity/Entity FIELD ar uuid Ljava/util/UUID; FIELD as uuidString Ljava/lang/String; FIELD at glowing Z - FIELD au factory Lagj; + FIELD au type Lagj; FIELD av entityId I FIELD aw passengerList Ljava/util/List; FIELD ax riddenEntity Lagf; @@ -65,7 +65,7 @@ CLASS agf net/minecraft/entity/Entity METHOD C_ shouldBroadcastConsoleToOps ()Z METHOD E updatePortalCooldown ()V METHOD Q getDisplayedName ()Lja; - METHOD R getFactory ()Lagj; + METHOD R getType ()Lagj; METHOD R_ getName ()Lja; METHOD S getEntityId ()I METHOD S_ hasCustomName ()Z diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping b/mappings/net/minecraft/entity/attribute/AbstractEntityAttribute.mapping similarity index 78% rename from mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping rename to mappings/net/minecraft/entity/attribute/AbstractEntityAttribute.mapping index 651be17526..bc264f4d61 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeImpl.mapping +++ b/mappings/net/minecraft/entity/attribute/AbstractEntityAttribute.mapping @@ -1,4 +1,4 @@ -CLASS ahf net/minecraft/entity/attribute/EntityAttributeImpl +CLASS ahf net/minecraft/entity/attribute/AbstractEntityAttribute FIELD a parent Lahc; FIELD b id Ljava/lang/String; FIELD c defaultValue D diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping b/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping similarity index 77% rename from mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping rename to mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping index ce25628e6d..c7495f11d0 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeContainerBase.mapping +++ b/mappings/net/minecraft/entity/attribute/AbstractEntityAttributeContainer.mapping @@ -1,4 +1,4 @@ -CLASS ahg net/minecraft/entity/attribute/EntityAttributeContainerBase +CLASS ahg net/minecraft/entity/attribute/AbstractEntityAttributeContainer FIELD a instancesByKey Ljava/util/Map; FIELD b instancesById Ljava/util/Map; METHOD a values ()Ljava/util/Collection; diff --git a/mappings/net/minecraft/entity/decoration/DecorationBaseEntity.mapping b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping similarity index 87% rename from mappings/net/minecraft/entity/decoration/DecorationBaseEntity.mapping rename to mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping index 22be3b1a5f..6ac09e060a 100644 --- a/mappings/net/minecraft/entity/decoration/DecorationBaseEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping @@ -1,4 +1,5 @@ -CLASS anw net/minecraft/entity/decoration/DecorationBaseEntity +CLASS anw net/minecraft/entity/decoration/AbstractDecorationEntity + FIELD a PREDICATE Ljava/util/function/Predicate; FIELD b blockPos Let; FIELD c facing Ley; METHOD (Lagj;Lban;Let;)V diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index 83be589456..a8acb876b7 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -17,7 +17,7 @@ CLASS apo net/minecraft/entity/mob/SlimeEntity METHOD e tick ()V FIELD bC SLIME_SIZE Lpn; METHOD F getLootTableId ()Lpy; - METHOD R getFactory ()Lagj; + METHOD R getType ()Lagj; METHOD V_ update ()V METHOD X invalidate ()V METHOD a (Lbao;Laex;Lagr;Lagz;Lhp;)Lagz; diff --git a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping index 8e9fa47b0b..a644d92e0e 100644 --- a/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping +++ b/mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping @@ -1,6 +1,6 @@ CLASS amw net/minecraft/entity/parts/IEntityPartDamageDelegate METHOD L_ getPartDamageWorld ()Lban; - METHOD R getFactory ()Lagj; + METHOD R getType ()Lagj; METHOD a damage (Lamx;Lafo;F)Z ARG 1 part ARG 2 source diff --git a/mappings/net/minecraft/entity/passive/DonkeyBaseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping similarity index 84% rename from mappings/net/minecraft/entity/passive/DonkeyBaseEntity.mapping rename to mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping index 4788c512a2..ad364b2fe4 100644 --- a/mappings/net/minecraft/entity/passive/DonkeyBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping @@ -1,4 +1,4 @@ -CLASS amj net/minecraft/entity/passive/DonkeyBaseEntity +CLASS amj net/minecraft/entity/passive/AbstractDonkeyEntity FIELD bM CHEST Lpn; METHOD a interactMob (Laqg;Laey;)Z ARG 1 player diff --git a/mappings/net/minecraft/entity/passive/EntityCat.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping similarity index 94% rename from mappings/net/minecraft/entity/passive/EntityCat.mapping rename to mappings/net/minecraft/entity/passive/CatEntity.mapping index ee34ef92a5..a54c2ac988 100644 --- a/mappings/net/minecraft/entity/passive/EntityCat.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -1,4 +1,4 @@ -CLASS all net/minecraft/entity/passive/EntityCat +CLASS all net/minecraft/entity/passive/CatEntity CLASS all$a METHOD a canStart ()Z METHOD b shouldContinue ()Z diff --git a/mappings/net/minecraft/state/property/PropertyBase.mapping b/mappings/net/minecraft/state/property/AbstractProperty.mapping similarity index 84% rename from mappings/net/minecraft/state/property/PropertyBase.mapping rename to mappings/net/minecraft/state/property/AbstractProperty.mapping index d07fab7047..64574beba5 100644 --- a/mappings/net/minecraft/state/property/PropertyBase.mapping +++ b/mappings/net/minecraft/state/property/AbstractProperty.mapping @@ -1,4 +1,4 @@ -CLASS bot net/minecraft/state/property/PropertyBase +CLASS bot net/minecraft/state/property/AbstractProperty FIELD a valueClass Ljava/lang/Class; FIELD b name Ljava/lang/String; FIELD c computedHashCode Ljava/lang/Integer; diff --git a/mappings/net/minecraft/state/property/PropertyBoolean.mapping b/mappings/net/minecraft/state/property/BooleanProperty.mapping similarity index 87% rename from mappings/net/minecraft/state/property/PropertyBoolean.mapping rename to mappings/net/minecraft/state/property/BooleanProperty.mapping index 5c182c83d0..27941bc5ec 100644 --- a/mappings/net/minecraft/state/property/PropertyBoolean.mapping +++ b/mappings/net/minecraft/state/property/BooleanProperty.mapping @@ -1,4 +1,4 @@ -CLASS boy net/minecraft/state/property/PropertyBoolean +CLASS boy net/minecraft/state/property/BooleanProperty FIELD a values Lcom/google/common/collect/ImmutableSet; METHOD a getValueAsString (Ljava/lang/Boolean;)Ljava/lang/String; METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; diff --git a/mappings/net/minecraft/state/property/PropertyEnum.mapping b/mappings/net/minecraft/state/property/EnumProperty.mapping similarity index 94% rename from mappings/net/minecraft/state/property/PropertyEnum.mapping rename to mappings/net/minecraft/state/property/EnumProperty.mapping index a937a6fda0..721c4dce90 100644 --- a/mappings/net/minecraft/state/property/PropertyEnum.mapping +++ b/mappings/net/minecraft/state/property/EnumProperty.mapping @@ -1,4 +1,4 @@ -CLASS bpe net/minecraft/state/property/PropertyEnum +CLASS bpe net/minecraft/state/property/EnumProperty FIELD a validValues Lcom/google/common/collect/ImmutableSet; FIELD b nameValueMap Ljava/util/Map; METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V diff --git a/mappings/net/minecraft/state/property/PropertyFacing.mapping b/mappings/net/minecraft/state/property/FacingProperty.mapping similarity index 86% rename from mappings/net/minecraft/state/property/PropertyFacing.mapping rename to mappings/net/minecraft/state/property/FacingProperty.mapping index 44abb596e6..4fce389858 100644 --- a/mappings/net/minecraft/state/property/PropertyFacing.mapping +++ b/mappings/net/minecraft/state/property/FacingProperty.mapping @@ -1,4 +1,4 @@ -CLASS bpb net/minecraft/state/property/PropertyFacing +CLASS bpb net/minecraft/state/property/FacingProperty METHOD (Ljava/lang/String;Ljava/util/Collection;)V ARG 1 name METHOD a create (Ljava/lang/String;Ljava/util/Collection;)Lbpb; diff --git a/mappings/net/minecraft/state/property/PropertyInteger.mapping b/mappings/net/minecraft/state/property/IntegerProperty.mapping similarity index 89% rename from mappings/net/minecraft/state/property/PropertyInteger.mapping rename to mappings/net/minecraft/state/property/IntegerProperty.mapping index 2ed3a4cd3b..049bc1b6f2 100644 --- a/mappings/net/minecraft/state/property/PropertyInteger.mapping +++ b/mappings/net/minecraft/state/property/IntegerProperty.mapping @@ -1,4 +1,4 @@ -CLASS bpg net/minecraft/state/property/PropertyInteger +CLASS bpg net/minecraft/state/property/IntegerProperty FIELD a validValues Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;II)V ARG 1 name diff --git a/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping b/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping index 1f5287d201..ebb683aba3 100644 --- a/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping @@ -7,7 +7,7 @@ CLASS at net/minecraft/util/json/EntityTypeJsonPredicate METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z CLASS at$b Single - FIELD b factory Lagj; + FIELD b type Lagj; METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z FIELD a ANY Lat; diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 8d48f5a929..f6c93710cf 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -10,7 +10,7 @@ CLASS fk net/minecraft/util/registry/Registry FIELD i POTION_EFFECT_TYPES Lfk; FIELD j BLOCKS Lex; FIELD k ENCHANTMENTS Lfk; - FIELD l ENTITY_FACTORIES Lfk; + FIELD l ENTITY_TYPES Lfk; FIELD m ITEMS Lex; FIELD n POTIONS Lfk; FIELD o CARVERS Lfk; diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index ed1da272dc..1f4d84632c 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -13,7 +13,7 @@ CLASS bbm net/minecraft/world/biome/Biome METHOD a depth (F)Lbbm$a; METHOD a waterColor (I)Lbbm$a; METHOD a category (Lbbm$b;)Lbbm$a; - METHOD a precipation (Lbbm$d;)Lbbm$a; + METHOD a precipitation (Lbbm$d;)Lbbm$a; METHOD a surfaceBuilder (Lcbm;)Lbbm$a; METHOD a configureSurfaceBuilder (Lcbw;Lcby;)Lbbm$a; ARG 1 surfaceBuilder @@ -59,11 +59,11 @@ CLASS bbm net/minecraft/world/biome/Biome FIELD e name Ljava/lang/String; METHOD a getName ()Ljava/lang/String; CLASS bbm$e SpawnListEntry - FIELD b factory Lagj; + FIELD b type Lagj; FIELD c minGroupSize I FIELD d maxGroupSize I METHOD (Lagj;III)V - ARG 1 factory + ARG 1 type ARG 2 weight ARG 3 minGroupSize FIELD a LOGGER Lorg/apache/logging/log4j/Logger; @@ -81,7 +81,7 @@ CLASS bbm net/minecraft/world/biome/Biome FIELD m parent Ljava/lang/String; FIELD n surfaceBuilder Lcbm; FIELD o category Lbbm$b; - FIELD p precipation Lbbm$d; + FIELD p precipitation Lbbm$d; FIELD q carversMap Ljava/util/Map; FIELD r featuresMap Ljava/util/Map; FIELD s features Ljava/util/List;