From a1b8da33a999a8829f319c45db373e7539f058e1 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Fri, 13 Mar 2020 08:55:19 -0500 Subject: [PATCH] Enchantments, vines, particles 11a (#1174) * Enchantments, vines, particles 11a Fixes #1084 as well * Detail on what the ench method does Signed-off-by: liach * Now this thing has a builder ye Signed-off-by: liach * Update mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping * Update mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping * Rename method sin weeping vine feature as requested by @supercoder7979 Signed-off-by: liach * Vines -> VineLogic Signed-off-by: liach Co-authored-by: liach --- .../block/AbstractPlantPartBlock.mapping | 3 +++ .../block/AbstractPlantStemBlock.mapping | 3 +++ .../minecraft/block/TwistingVinesBlock.mapping | 2 ++ .../block/TwistingVinesPlantBlock.mapping | 1 + mappings/net/minecraft/block/VineLogic.mapping | 4 ++++ .../block/WeepingVinesPlantBlock.mapping | 3 +-- .../particle/AbstractSlowingParticle.mapping | 1 + .../client/particle/FlameParticle.mapping | 7 +++++++ .../client/particle/SoulParticle.mapping | 15 +++++++++++++++ .../minecraft/enchantment/Enchantment.mapping | 16 ++++++++++++++-- .../enchantment/EnchantmentHelper.mapping | 11 ++++++++--- .../enchantment/SoulSpeedEnchantment.mapping | 4 ++++ .../function/EnchantRandomlyLootFunction.mapping | 4 ++++ .../gen/feature/TwistingVinesFeature.mapping | 15 +++++++++++++++ .../gen/feature/WeepingVinesFeature.mapping | 6 +++--- 15 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 mappings/net/minecraft/block/TwistingVinesBlock.mapping create mode 100644 mappings/net/minecraft/block/TwistingVinesPlantBlock.mapping create mode 100644 mappings/net/minecraft/block/VineLogic.mapping create mode 100644 mappings/net/minecraft/client/particle/AbstractSlowingParticle.mapping create mode 100644 mappings/net/minecraft/client/particle/SoulParticle.mapping create mode 100644 mappings/net/minecraft/enchantment/SoulSpeedEnchantment.mapping create mode 100644 mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping diff --git a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping index cdd46f06e3..e0ed9b33d0 100644 --- a/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantPartBlock.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/class_4863 net/minecraft/block/AbstractPlantPartBlock FIELD field_22507 growthDirection Lnet/minecraft/class_2350; FIELD field_22508 tickWater Z + FIELD field_23080 outlineShape Lnet/minecraft/class_265; METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Lnet/minecraft/class_265;Z)V ARG 1 settings ARG 2 growthDirection + ARG 3 outlineShape + ARG 4 tickWater METHOD method_24945 getStem ()Lnet/minecraft/class_4865; METHOD method_24946 getPlant ()Lnet/minecraft/class_2248; METHOD method_24947 canAttachTo (Lnet/minecraft/class_2248;)Z diff --git a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping index 05a5821811..dd2019b483 100644 --- a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_4865 net/minecraft/block/AbstractPlantStemBlock METHOD (Lnet/minecraft/class_2248$class_2251;Lnet/minecraft/class_2350;Lnet/minecraft/class_265;ZD)V ARG 1 settings ARG 2 growthDirection + ARG 3 outlineShape + ARG 4 tickWater + ARG 5 growthChance METHOD method_24948 getRandomGrowthState (Lnet/minecraft/class_1936;)Lnet/minecraft/class_2680; ARG 1 world METHOD method_24949 chooseStemState (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/TwistingVinesBlock.mapping b/mappings/net/minecraft/block/TwistingVinesBlock.mapping new file mode 100644 index 0000000000..cd9fd2c38e --- /dev/null +++ b/mappings/net/minecraft/block/TwistingVinesBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4777 net/minecraft/block/TwistingVinesBlock + FIELD field_22172 SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/TwistingVinesPlantBlock.mapping b/mappings/net/minecraft/block/TwistingVinesPlantBlock.mapping new file mode 100644 index 0000000000..3df9810b81 --- /dev/null +++ b/mappings/net/minecraft/block/TwistingVinesPlantBlock.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4950 net/minecraft/block/TwistingVinesPlantBlock diff --git a/mappings/net/minecraft/block/VineLogic.mapping b/mappings/net/minecraft/block/VineLogic.mapping new file mode 100644 index 0000000000..376b045e36 --- /dev/null +++ b/mappings/net/minecraft/block/VineLogic.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4949 net/minecraft/block/VineLogic + FIELD field_23081 STEM_OUTLINE_SHAPE Lnet/minecraft/class_265; + METHOD method_25961 isValidForWeepingStem (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/WeepingVinesPlantBlock.mapping b/mappings/net/minecraft/block/WeepingVinesPlantBlock.mapping index 2ba00e413f..c4d4c263af 100644 --- a/mappings/net/minecraft/block/WeepingVinesPlantBlock.mapping +++ b/mappings/net/minecraft/block/WeepingVinesPlantBlock.mapping @@ -1,2 +1 @@ -CLASS net/minecraft/class_4777 net/minecraft/block/WeepingVinesPlantBlock - FIELD field_22172 SHAPE Lnet/minecraft/class_265; +CLASS net/minecraft/class_4951 net/minecraft/block/WeepingVinesPlantBlock diff --git a/mappings/net/minecraft/client/particle/AbstractSlowingParticle.mapping b/mappings/net/minecraft/client/particle/AbstractSlowingParticle.mapping new file mode 100644 index 0000000000..0a2cb3a3d9 --- /dev/null +++ b/mappings/net/minecraft/client/particle/AbstractSlowingParticle.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4955 net/minecraft/client/particle/AbstractSlowingParticle diff --git a/mappings/net/minecraft/client/particle/FlameParticle.mapping b/mappings/net/minecraft/client/particle/FlameParticle.mapping index a58fa52f85..61602d3be6 100644 --- a/mappings/net/minecraft/client/particle/FlameParticle.mapping +++ b/mappings/net/minecraft/client/particle/FlameParticle.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_687 net/minecraft/client/particle/FlameParticle METHOD (Lnet/minecraft/class_1937;DDDDDD)V + ARG 1 world ARG 2 x ARG 4 y ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ CLASS class_688 Factory + FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SoulParticle.mapping b/mappings/net/minecraft/client/particle/SoulParticle.mapping new file mode 100644 index 0000000000..63159810b7 --- /dev/null +++ b/mappings/net/minecraft/client/particle/SoulParticle.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4956 net/minecraft/client/particle/SoulParticle + FIELD field_23091 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_1937;DDDDDDLnet/minecraft/class_4002;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + ARG 14 spriteProvider + CLASS class_4957 Factory + FIELD field_23092 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index bba8d034ec..ab97ac48af 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -9,13 +9,21 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment ARG 3 slotTypes METHOD method_20742 getMaximumPower (I)I ARG 1 level + METHOD method_25949 isAvailableForEnchantedBookOffer ()Z + COMMENT Returns whether this enchantment will appear in the enchanted book trade + COMMENT offers of librarian villagers. + METHOD method_25950 isAvailableForRandomSelection ()Z + COMMENT Returns whether this enchantment will appear in the enchanting table or + COMMENT loots with random enchant function. METHOD method_8178 onUserDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user ARG 2 attacker ARG 3 level METHOD method_8179 getName (I)Lnet/minecraft/class_2561; ARG 1 level - METHOD method_8180 differs (Lnet/minecraft/class_1887;)Z + METHOD method_8180 canAccept (Lnet/minecraft/class_1887;)Z + COMMENT Returns whether this enchantment can exist on an item stack with the + COMMENT {@code other} enchantment. ARG 1 other METHOD method_8181 getProtectionAmount (ILnet/minecraft/class_1282;)I ARG 1 level @@ -25,9 +33,13 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment METHOD method_8183 getMaximumLevel ()I METHOD method_8184 getTranslationKey ()Ljava/lang/String; METHOD method_8185 getEquipment (Lnet/minecraft/class_1309;)Ljava/util/Map; + ARG 1 entity METHOD method_8186 getWeight ()Lnet/minecraft/class_1887$class_1888; METHOD method_8187 getMinimumLevel ()I - METHOD method_8188 isDifferent (Lnet/minecraft/class_1887;)Z + METHOD method_8188 canCombine (Lnet/minecraft/class_1887;)Z + COMMENT Returns whether this enchantment can exist on an item stack with the + COMMENT {@code other} enchantment and the {@code other} enchantment can exist + COMMENT with this enchantment. ARG 1 other METHOD method_8189 onTargetDamaged (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;I)V ARG 1 user diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index d25c416151..a3ea733445 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -4,13 +4,17 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_22445 getEnchantments (Lnet/minecraft/class_2499;)Ljava/util/Map; ARG 0 tag METHOD method_24365 getMatchingEnchantedEquipment (Lnet/minecraft/class_1887;Lnet/minecraft/class_1309;Ljava/util/function/Predicate;)Ljava/util/Map$Entry; + METHOD method_25951 hasSoulSpeed (Lnet/minecraft/class_1309;)Z + ARG 0 entity METHOD method_8199 getFireAspect (Lnet/minecraft/class_1309;)I ARG 0 entity METHOD method_8200 hasAquaAffinity (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_8201 contains (Ljava/util/Collection;Lnet/minecraft/class_1887;)Z - ARG 0 collection - ARG 1 enchantment + METHOD method_8201 isCompatible (Ljava/util/Collection;Lnet/minecraft/class_1887;)Z + COMMENT Returns whether the {@code candidate} enchantment is compatible with the + COMMENT {@code existing} enchantments. + ARG 0 existing + ARG 1 candidate METHOD method_8202 getRiptide (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8203 getEquipmentLevel (Lnet/minecraft/class_1887;Lnet/minecraft/class_1309;)I @@ -73,6 +77,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper METHOD method_8229 getHighestApplicableEnchantmentsAtPower (ILnet/minecraft/class_1799;Z)Ljava/util/List; ARG 0 power ARG 1 stack + ARG 2 treasureAllowed METHOD method_8230 getEnchantments (Ljava/util/Random;Lnet/minecraft/class_1799;IZ)Ljava/util/List; ARG 0 random ARG 1 stack diff --git a/mappings/net/minecraft/enchantment/SoulSpeedEnchantment.mapping b/mappings/net/minecraft/enchantment/SoulSpeedEnchantment.mapping new file mode 100644 index 0000000000..9d1a7e4be1 --- /dev/null +++ b/mappings/net/minecraft/enchantment/SoulSpeedEnchantment.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_4948 net/minecraft/enchantment/SoulSpeedEnchantment + METHOD (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V + ARG 1 weight + ARG 2 slotTypes diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 1b0478a92e..1316bb15c1 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -8,3 +8,7 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; CLASS class_110 Factory + CLASS class_4954 Builder + FIELD field_23090 enchantments Ljava/util/Set; + METHOD method_25992 add (Lnet/minecraft/class_1887;)Lnet/minecraft/class_109$class_4954; + ARG 1 enchantment diff --git a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping new file mode 100644 index 0000000000..7dd2408248 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeature + METHOD method_25986 isNotSuitable (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 maxLength + ARG 4 minAge + ARG 5 maxAge + METHOD method_25988 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 random + ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping index fc02fcdaa5..93e7ec60a1 100644 --- a/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping @@ -1,17 +1,17 @@ CLASS net/minecraft/class_4784 net/minecraft/world/gen/feature/WeepingVinesFeature FIELD field_22196 DIRECTIONS [Lnet/minecraft/class_2350; - METHOD method_24450 generateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V + METHOD method_24450 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V ARG 0 world ARG 1 random ARG 2 pos ARG 3 length ARG 4 minAge ARG 5 maxAge - METHOD method_24451 tryGenerateNearVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V + METHOD method_24451 generateNetherWartBlocksInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 random ARG 3 pos - METHOD method_24452 tryGenerateFarVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V + METHOD method_24452 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 random ARG 3 pos