From 9357e4ea58f630fe4064011a10d51833c07aa0b1 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Thu, 19 Mar 2020 09:42:14 -0500 Subject: [PATCH] A few uuid fixes mapped (#1201) Now enigma takes too long decompiling some classes. Weird... Signed-off-by: liach Co-authored-by: liach --- .../datafixer/fix/AbstractUuidFix.mapping | 35 ++++++++++++++++++ .../datafixer/fix/BlockEntityUuidFix.mapping | 7 ++++ .../datafixer/fix/EntityUuidFix.mapping | 37 +++++++++++++++++++ .../datafixer/fix/ItemStackUuidFix.mapping | 3 ++ .../datafixer/fix/PlayerUuidFix.mapping | 3 ++ .../datafixer/fix/WorldUuidFix.mapping | 3 ++ 6 files changed, 88 insertions(+) create mode 100644 mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/ItemStackUuidFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/PlayerUuidFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping diff --git a/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping new file mode 100644 index 0000000000..8cc35d681f --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/AbstractUuidFix.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/class_4958 net/minecraft/datafixer/fix/AbstractUuidFix + FIELD field_23120 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_23121 typeReference Lcom/mojang/datafixers/DSL$TypeReference; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;)V + ARG 1 outputSchema + ARG 2 typeReference + METHOD method_26002 createArrayFromCompoundUuid (Lcom/mojang/datafixers/Dynamic;)Ljava/util/Optional; + ARG 0 uuidCompound + METHOD method_26003 createArray (Lcom/mojang/datafixers/Dynamic;JJ)Ljava/util/Optional; + ARG 0 parent + ARG 1 mostBits + ARG 3 leastBits + METHOD method_26005 createArrayFromStringUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 parent + ARG 1 key + METHOD method_26006 updateStringUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 parent + ARG 1 oldKey + ARG 2 newKey + METHOD method_26009 updateTyped (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed; + ARG 1 typed + ARG 2 name + ARG 3 updater + METHOD method_26011 updateCompoundUuid (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 parent + ARG 1 oldKey + ARG 2 newKey + METHOD method_26013 updateRegularMostLeast (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 parent + ARG 1 oldKey + ARG 2 newKey + METHOD method_26014 createArrayFromMostLeastTags (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Optional; + ARG 0 parent + ARG 1 mostBitsKey + ARG 2 leastBitsKey diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping new file mode 100644 index 0000000000..5fba784c3a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BlockEntityUuidFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_4959 net/minecraft/datafixer/fix/BlockEntityUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_26017 updateSkull (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26018 updateConduit (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root diff --git a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping new file mode 100644 index 0000000000..59847280fc --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_4960 net/minecraft/datafixer/fix/EntityUuidFix + FIELD field_23122 RIDEABLE_TAMEABLES Ljava/util/Set; + FIELD field_23123 TAMEABLE_PETS Ljava/util/Set; + FIELD field_23124 BREEDABLES Ljava/util/Set; + FIELD field_23125 LEASHABLES Ljava/util/Set; + FIELD field_23126 OTHER_LIVINGS Ljava/util/Set; + FIELD field_23127 PROJECTILES Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_26022 updateAngryAtMemory (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 dynamic + METHOD method_26024 updateEvokerFangs (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26026 updateZombieVillager (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26028 updateAreaEffectCloud (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26030 updateShulkerBullet (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26031 updateItemEntity (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26032 updateFox (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26033 updateZombifiedPiglin (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26034 updateTameable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26035 updateBreedable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26036 updateLeashable (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26037 updateLiving (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26038 updateProjectile (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root + METHOD method_26039 updateSelfUuid (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + ARG 1 root diff --git a/mappings/net/minecraft/datafixer/fix/ItemStackUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemStackUuidFix.mapping new file mode 100644 index 0000000000..dd3f1125ee --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemStackUuidFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4961 net/minecraft/datafixer/fix/ItemStackUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/PlayerUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/PlayerUuidFix.mapping new file mode 100644 index 0000000000..1b77599925 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/PlayerUuidFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4963 net/minecraft/datafixer/fix/PlayerUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping new file mode 100644 index 0000000000..52548541ce --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4962 net/minecraft/datafixer/fix/WorldUuidFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema