From c52a1b78a639999a15cdf248c78e1ebfebec4e98 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sat, 8 Feb 2020 04:02:51 -0600 Subject: [PATCH] dfu and particles (#1092) * dfu and particles Signed-off-by: liach * Add missing particle, fix #1093 Signed-off-by: liach * Missing stuff Signed-off-by: liach * Fix another misplaced fixer class Signed-off-by: liach --- .../client/particle/AscendingParticle.mapping | 19 +++++++++++++++++++ .../client/particle/AshParticle.mapping | 3 +++ ...mapping => LargeFireSmokeParticle.mapping} | 3 ++- .../particle/WaterSuspendParticle.mapping | 6 ++++++ .../datafixer/StructureReferenceFixer.mapping | 2 -- .../datafixer/fix/BiomeRenameFix.mapping | 6 ++++++ .../datafixer/fix/FurnaceRecipesFix.mapping | 6 ++++++ .../fix/StructureReferenceFix.mapping | 5 +++++ .../datafixer/fix/WallPropertyFix.mapping | 9 +++++++++ .../IdentifierNormalizingSchema.mapping | 6 ++++++ .../datafixer/schema/Schema100.mapping | 2 ++ .../datafixer/schema/Schema2501.mapping | 5 +++++ .../datafixer/schema/Schema2502.mapping | 5 +++++ .../schema/SchemaIdentifierNormalize.mapping | 2 -- 14 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/client/particle/AscendingParticle.mapping create mode 100644 mappings/net/minecraft/client/particle/AshParticle.mapping rename mappings/net/minecraft/client/particle/{FireSmokeLargeParticle.mapping => LargeFireSmokeParticle.mapping} (50%) delete mode 100644 mappings/net/minecraft/datafixer/StructureReferenceFixer.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema2501.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema2502.mapping delete mode 100644 mappings/net/minecraft/datafixer/schema/SchemaIdentifierNormalize.mapping diff --git a/mappings/net/minecraft/client/particle/AscendingParticle.mapping b/mappings/net/minecraft/client/particle/AscendingParticle.mapping new file mode 100644 index 0000000000..fa3d9792d7 --- /dev/null +++ b/mappings/net/minecraft/client/particle/AscendingParticle.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_4794 net/minecraft/client/particle/AscendingParticle + FIELD field_22236 ascendingAcceleration D + FIELD field_22237 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_1937;DDDFFFDDDFLnet/minecraft/class_4002;FID)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 randomVelocityXMultiplier + ARG 9 randomVelocityYMultiplier + ARG 10 randomVelocityZMultiplier + ARG 11 velocityX + ARG 13 velocityY + ARG 15 velocityZ + ARG 17 scaleMultiplier + ARG 18 spriteProvider + ARG 19 colorMultiplier + ARG 20 baseMaxAge + ARG 21 ascendingAcceleration diff --git a/mappings/net/minecraft/client/particle/AshParticle.mapping b/mappings/net/minecraft/client/particle/AshParticle.mapping new file mode 100644 index 0000000000..9472e8e6e1 --- /dev/null +++ b/mappings/net/minecraft/client/particle/AshParticle.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4792 net/minecraft/client/particle/AshParticle + CLASS class_4793 Factory + FIELD field_22235 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping b/mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping similarity index 50% rename from mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping rename to mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping index e32548edb4..4e51f4ec58 100644 --- a/mappings/net/minecraft/client/particle/FireSmokeLargeParticle.mapping +++ b/mappings/net/minecraft/client/particle/LargeFireSmokeParticle.mapping @@ -1,7 +1,8 @@ -CLASS net/minecraft/class_696 net/minecraft/client/particle/FireSmokeLargeParticle +CLASS net/minecraft/class_696 net/minecraft/client/particle/LargeFireSmokeParticle METHOD (Lnet/minecraft/class_1937;DDDDDDLnet/minecraft/class_4002;)V ARG 1 world ARG 2 x ARG 4 y ARG 6 z CLASS class_697 Factory + FIELD field_17817 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping b/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping index ade817e840..5333ed7ba2 100644 --- a/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/WaterSuspendParticle.mapping @@ -3,3 +3,9 @@ CLASS net/minecraft/class_723 net/minecraft/client/particle/WaterSuspendParticle ARG 2 x ARG 4 y ARG 6 z + CLASS class_4795 CrimsonSporeFactory + FIELD field_22238 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4796 UnderwaterFactory + FIELD field_22239 spriteProvider Lnet/minecraft/class_4002; + CLASS class_4797 WarpedSporeFactory + FIELD field_22240 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/datafixer/StructureReferenceFixer.mapping b/mappings/net/minecraft/datafixer/StructureReferenceFixer.mapping deleted file mode 100644 index 8e64c6ad0a..0000000000 --- a/mappings/net/minecraft/datafixer/StructureReferenceFixer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_4695 net/minecraft/datafixer/StructureReferenceFixer - METHOD method_23661 updateReferences (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping new file mode 100644 index 0000000000..6c3ebad045 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BiomeRenameFix.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4753 net/minecraft/datafixer/fix/BiomeRenameFix + FIELD field_21959 renames Ljava/util/Map; + METHOD (Lcom/mojang/datafixers/schemas/Schema;ZLjava/util/Map;)V + ARG 1 outputSchema + ARG 2 changesType + ARG 3 renames diff --git a/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping b/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping new file mode 100644 index 0000000000..454ffc677d --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/FurnaceRecipesFix.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_4752 net/minecraft/datafixer/fix/FurnaceRecipesFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_24313 updateBlockEntities (Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; + METHOD method_24314 updateBlockEntityData (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping new file mode 100644 index 0000000000..66246bfa80 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/StructureReferenceFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_4695 net/minecraft/datafixer/fix/StructureReferenceFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_23661 updateReferences (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping new file mode 100644 index 0000000000..11c552df21 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/WallPropertyFix.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_4754 net/minecraft/datafixer/fix/WallPropertyFix + FIELD field_21960 TARGET_BLOCK_IDS Ljava/util/Set; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_24323 updateWallProperties (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24324 updateWallValueReference (Lcom/mojang/datafixers/Dynamic;Ljava/lang/String;)Lcom/mojang/datafixers/Dynamic; + METHOD method_24326 booleanToWallType (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value diff --git a/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping new file mode 100644 index 0000000000..12fe85ec7e --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/IdentifierNormalizingSchema.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_1220 net/minecraft/datafixer/schema/IdentifierNormalizingSchema + METHOD (ILcom/mojang/datafixers/schemas/Schema;)V + ARG 1 versionKey + ARG 2 parent + METHOD method_5193 normalize (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id diff --git a/mappings/net/minecraft/datafixer/schema/Schema100.mapping b/mappings/net/minecraft/datafixer/schema/Schema100.mapping index 00696c9b12..b2a36dc93d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema100.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema100.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_1222 net/minecraft/datafixer/schema/Schema100 + METHOD method_5195 targetEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + METHOD method_5196 targetItems (Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate; diff --git a/mappings/net/minecraft/datafixer/schema/Schema2501.mapping b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping new file mode 100644 index 0000000000..b1dafd306d --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema2501.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_4755 net/minecraft/datafixer/schema/Schema2501 + METHOD method_24330 targetRecipeUsedField (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/Schema2502.mapping b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping new file mode 100644 index 0000000000..7169eece09 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema2502.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_4756 net/minecraft/datafixer/schema/Schema2502 + METHOD method_24332 targetEntity (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V + ARG 0 schema + ARG 1 map + ARG 2 name diff --git a/mappings/net/minecraft/datafixer/schema/SchemaIdentifierNormalize.mapping b/mappings/net/minecraft/datafixer/schema/SchemaIdentifierNormalize.mapping deleted file mode 100644 index f0860516ff..0000000000 --- a/mappings/net/minecraft/datafixer/schema/SchemaIdentifierNormalize.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_1220 net/minecraft/datafixer/schema/SchemaIdentifierNormalize - METHOD method_5193 normalize (Ljava/lang/String;)Ljava/lang/String;