From a2d36ad0b710609762fb442a051d1b65f17cd2b3 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 7 May 2024 19:39:02 +0900 Subject: [PATCH] Enchantment stuff --- mappings/net/minecraft/enchantment/Enchantment.mapping | 2 ++ ...ffectConditions.mapping => EnchantmentEffectEntry.mapping} | 4 +++- .../effect/EnchantmentLocationBasedEffectType.mapping | 1 + .../effect/entity/ExplodeEnchantmentEffectType.mapping | 2 ++ .../effect/entity/ReplaceBlockEnchantmentEffectType.mapping | 2 ++ .../effect/entity/ReplaceDiscEnchantmentEffectType.mapping | 2 ++ .../effect/entity/SpawnParticlesEnchantmentEffectType.mapping | 2 ++ 7 files changed, 14 insertions(+), 1 deletion(-) rename mappings/net/minecraft/enchantment/effect/{EnchantmentEffectConditions.mapping => EnchantmentEffectEntry.mapping} (82%) diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index f0adc688e3..dcab238b4e 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -309,6 +309,8 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment ARG 1 effectType ARG 2 effect ARG 3 requirements + METHOD method_60068 (Lnet/minecraft/class_9331;Lnet/minecraft/class_9331;)Ljava/util/List; + ARG 2 type METHOD method_60069 getEffectsList (Lnet/minecraft/class_9331;)Ljava/util/List; ARG 1 effectType METHOD method_60070 addNonListEffect (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_1887$class_9700; diff --git a/mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping b/mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping similarity index 82% rename from mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping rename to mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping index 80ddbfca2a..a043d39566 100644 --- a/mappings/net/minecraft/enchantment/effect/EnchantmentEffectConditions.mapping +++ b/mappings/net/minecraft/enchantment/effect/EnchantmentEffectEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffectConditions +CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffectEntry METHOD method_60004 createCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_176;)Lcom/mojang/serialization/Codec; ARG 0 effectCodec ARG 1 lootContextType @@ -8,5 +8,7 @@ CLASS net/minecraft/class_9698 net/minecraft/enchantment/effect/EnchantmentEffec ARG 1 context METHOD method_60007 createRequirementsCodec (Lnet/minecraft/class_176;)Lcom/mojang/serialization/Codec; ARG 0 lootContextType + METHOD method_60008 (Lnet/minecraft/class_176;Lnet/minecraft/class_5341;)Lcom/mojang/serialization/DataResult; + ARG 1 condition METHOD method_60010 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 errors diff --git a/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping b/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping index 14c3251f51..ec16886ff7 100644 --- a/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffectType.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_9722 net/minecraft/enchantment/effect/EnchantmentLocat ARG 3 context ARG 4 user ARG 5 pos + ARG 6 newlyApplied METHOD method_60222 remove (Lnet/minecraft/class_9699;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;I)V ARG 1 context ARG 2 user diff --git a/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping index b2788be824..586098031a 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_9724 net/minecraft/enchantment/effect/entity/ExplodeEnchantmentEffectType FIELD field_51710 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60234 (ILnet/minecraft/class_9704;)Ljava/lang/Float; + ARG 1 knockbackMultiplier METHOD method_60235 getDamageSource (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;)Lnet/minecraft/class_1282; ARG 1 user ARG 2 pos diff --git a/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping index e1cdc52f55..6064f3699e 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_9729 net/minecraft/enchantment/effect/entity/ReplaceBlockEnchantmentEffectType FIELD field_51715 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60242 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6646;)Ljava/lang/Boolean; + ARG 2 predicate METHOD method_60243 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping index 1e8f02598c..fbaedf0524 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_9730 net/minecraft/enchantment/effect/entity/ReplaceDiscEnchantmentEffectType FIELD field_51716 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_60244 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_6646;)Ljava/lang/Boolean; + ARG 2 predicate METHOD method_60245 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping b/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping index 9c27dc05f0..456040d6ad 100644 --- a/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping +++ b/mappings/net/minecraft/enchantment/effect/entity/SpawnParticlesEnchantmentEffectType.mapping @@ -17,6 +17,8 @@ CLASS net/minecraft/class_9734 net/minecraft/enchantment/effect/entity/SpawnPart ARG 4 random METHOD method_60255 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_60256 (Lnet/minecraft/class_9734$class_9735;)Lcom/mojang/serialization/DataResult; + ARG 0 source CLASS class_9736 PositionSourceType FIELD field_51725 CODEC Lcom/mojang/serialization/Codec; FIELD field_51726 id Ljava/lang/String;