forked from QuiltMC/quilt-mappings
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
136 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| CLASS net/minecraft/unmapped/C_teerivzm net/minecraft/block/Portal | ||
| METHOD m_kzlfoqae getEffect ()Lnet/minecraft/unmapped/C_teerivzm$C_budwrmur; | ||
| METHOD m_ssylpsbj createTransition (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zbvyjshu; | ||
| ARG 2 entity | ||
| METHOD m_ynslrhia getTransitionTime (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)I | ||
| ARG 2 entity | ||
| CLASS C_budwrmur Effect |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| CLASS net/minecraft/unmapped/C_gbavazgo net/minecraft/entity/Leashable | ||
| FIELD f_crwvitgo MAX_LEASH_LENGTH D | ||
| FIELD f_hwlweeax LEASH_NBT_KEY Ljava/lang/String; | ||
| FIELD f_iiewyzxn STRETCH_DISTANCE D | ||
| METHOD m_egrefywv isLeashed ()Z | ||
| METHOD m_eodbrgla canLeashAttachTo ()Z | ||
| METHOD m_epgfrqcc attachLeash (Lnet/minecraft/unmapped/C_astfners;Z)V | ||
| METHOD m_feakufat mayBeLeashed ()Z | ||
| METHOD m_fmujdyoh readLeashData (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu; | ||
| METHOD m_frfgxbsb applyCloseRangeBehavior (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 1 entity | ||
| METHOD m_gnuhezcf getLeashHolder (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_astfners; | ||
| ARG 0 leashed | ||
| METHOD m_hkieuyqm getLeashData ()Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu; | ||
| METHOD m_jywtllgu setDelayedLeashHolderId (I)V | ||
| ARG 1 delayedLeashHolderId | ||
| METHOD m_kkwyhrvj applyTooFarBehavior ()V | ||
| METHOD m_lccupwok setLeashData (Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu;)V | ||
| ARG 1 data | ||
| METHOD m_ovrpaqfw attachLeash (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;Z)V | ||
| ARG 0 entity | ||
| ARG 1 leashHolder | ||
| ARG 2 sendPacket | ||
| METHOD m_ssfsnjwp applyLegacyElasticity (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;F)V | ||
| ARG 0 entity | ||
| ARG 1 holder | ||
| ARG 2 distance | ||
| METHOD m_xkmzlwed getLeashHolder ()Lnet/minecraft/unmapped/C_astfners; | ||
| METHOD m_xvyvanvw canBeLeashed ()Z | ||
| METHOD m_ydkqpzwu tickLeash (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 0 entity | ||
| METHOD m_ydrqybvl writeLeashData (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu;)V | ||
| ARG 1 compound | ||
| ARG 2 data | ||
| METHOD m_yglfvmek detachLeash (ZZ)V | ||
| METHOD m_ygwjgcso applyElasticRangeBehavior (Lnet/minecraft/unmapped/C_astfners;F)V | ||
| ARG 1 holder | ||
| ARG 2 distance | ||
| METHOD m_yvbpzuud resolveLeashData (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_gbavazgo$C_trsxpkpu;)V | ||
| ARG 1 data | ||
| METHOD m_zkhlcdom applyLongRangeBehavior (Lnet/minecraft/unmapped/C_astfners;F)Z | ||
| ARG 1 holder | ||
| ARG 2 distance | ||
| METHOD m_zuzsbkuh detachLeash (Lnet/minecraft/unmapped/C_astfners;ZZ)V | ||
| ARG 0 entity | ||
| ARG 1 sendPacket | ||
| ARG 2 dropItem | ||
| CLASS C_trsxpkpu LeashData | ||
| FIELD f_tsbjpbyd leashHolder Lnet/minecraft/unmapped/C_astfners; | ||
| FIELD f_yxdlhpfy delayedLeashHolderId I | ||
| FIELD f_znxcvkfw delayedLeashData Lcom/mojang/datafixers/util/Either; | ||
| METHOD m_kskpcsjf setLeashHolder (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 1 holder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
mappings/net/minecraft/entity/decoration/BlockAttachedEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| CLASS net/minecraft/unmapped/C_mfdvqmsw net/minecraft/entity/decoration/BlockAttachedEntity | ||
| FIELD f_atnmykql attachCheckCounter I | ||
| METHOD <init> (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V | ||
| ARG 1 type | ||
| METHOD m_fodqxigf getAttachedBlockPos ()Lnet/minecraft/unmapped/C_hynzadkk; | ||
| METHOD m_kulkifdk dropItem (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 1 breaker | ||
| METHOD m_uzlyxllu canStayAttached ()Z | ||
| METHOD m_woivokxp updateBoundingBox ()V |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| CLASS net/minecraft/unmapped/C_zbvyjshu net/minecraft/world/DimensionTransition | ||
| FIELD f_fbtpbgjw PLACE_PORTAL_CHUNK_TICKET Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn; | ||
| FIELD f_hmhvezqn newWorld Lnet/minecraft/unmapped/C_bdwnwhiu; | ||
| FIELD f_jgwyllbi NO_OP Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn; | ||
| FIELD f_kidpbkzf PLAY_PORTAL_SOUND Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn; | ||
| METHOD <init> (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)V | ||
| ARG 2 entity | ||
| METHOD m_ciosvisu playPortalSound (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 0 entity | ||
| METHOD m_kfblgmun missingRespawnBlock (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu; | ||
| METHOD m_tmiapkfg placePortalChunkTicket (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 0 entity | ||
| METHOD m_uahwixgh newWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu; | ||
| METHOD m_vxzgepsf getSpawnPos (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_vgpupfxx; | ||
| ARG 1 entity | ||
| CLASS C_pytyshdn PostDimensionTransition | ||
| METHOD m_dnvdmgtl (Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 2 entity | ||
| METHOD onTransition onTransition (Lnet/minecraft/unmapped/C_astfners;)V | ||
| ARG 1 entity | ||
| METHOD then then (Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn; | ||
| ARG 1 next |
7dc26fdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With commit 7dc26fd, 165 file(s) were updated with 1832 line(s) added and 1683 removed compared to the latest Quilt Mappings version.
View the diff here (1/3):
7dc26fdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
View the diff here (2/3):
7dc26fdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
View the diff here (3/3):
Continuation of the last diff... for (EnchantmentLevelEntry lv : list) { - stack.m_nisvbeaw(lv.f_ykbaoghe, lv.level); + stack.m_nisvbeaw(lv.enchantment, lv.level); } return stack; @@ -677,23 +688,25 @@ /** * @mapping {@literal hashed m_udfcqeza Lnet/minecraft/unmapped/C_jakrppis;m_udfcqeza(Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_sddaxwyk;ILjava/util/stream/Stream;)Ljava/util/List;} - * @mapping {@literal named m_udfcqeza Lnet/minecraft/enchantment/EnchantmentHelper;m_udfcqeza(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILjava/util/stream/Stream;)Ljava/util/List;} + * @mapping {@literal named generateEnchantments Lnet/minecraft/enchantment/EnchantmentHelper;generateEnchantments(Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/item/ItemStack;ILjava/util/stream/Stream;)Ljava/util/List;} */ - public static List<EnchantmentLevelEntry> m_udfcqeza(RandomGenerator random, ItemStack stack, int i, Stream<Holder<Enchantment>> stream) { + public static List<EnchantmentLevelEntry> generateEnchantments( + RandomGenerator random, ItemStack stack, int level, Stream<Holder<Enchantment>> possibleEnchantments + ) { List<EnchantmentLevelEntry> list = Lists.<EnchantmentLevelEntry>newArrayList(); Item lv = stack.getItem(); int j = lv.getEnchantability(); if (j <= 0) { return list; } else { - i += 1 + random.nextInt(j / 4 + 1) + random.nextInt(j / 4 + 1); + level += 1 + random.nextInt(j / 4 + 1) + random.nextInt(j / 4 + 1); float f = (random.nextFloat() + random.nextFloat() - 1.0F) * 0.15F; - i = MathHelper.clamp(Math.round((float)i + (float)i * f), 1, Integer.MAX_VALUE); - List<EnchantmentLevelEntry> list2 = m_pngonrhw(i, stack, stream); + level = MathHelper.clamp(Math.round((float)level + (float)level * f), 1, Integer.MAX_VALUE); + List<EnchantmentLevelEntry> list2 = getPossibleLevelEntries(level, stack, possibleEnchantments); if (!list2.isEmpty()) { Weighting.getRandomItem(random, list2).ifPresent(list::add); - while (random.nextInt(50) <= i) { + while (random.nextInt(50) <= level) { if (!list.isEmpty()) { removeConflicts(list2, Util.getLast(list)); } @@ -703,7 +716,7 @@ } Weighting.getRandomItem(random, list2).ifPresent(list::add); - i /= 2; + level /= 2; } } @@ -722,15 +735,16 @@ * @mapping {@literal named removeConflicts Lnet/minecraft/enchantment/EnchantmentHelper;removeConflicts(Ljava/util/List;Lnet/minecraft/enchantment/EnchantmentLevelEntry;)V} */ public static void removeConflicts(List<EnchantmentLevelEntry> possibleEntries, EnchantmentLevelEntry pickedEntry) { - possibleEntries.removeIf(arg2 -> !Enchantment.m_ycasfcso(pickedEntry.f_ykbaoghe, arg2.f_ykbaoghe)); + possibleEntries.removeIf(arg2 -> !Enchantment.areCompatible(pickedEntry.enchantment, arg2.enchantment)); } /** - * Mapping not found + * @mapping {@literal hashed m_ecxgwxiu Lnet/minecraft/unmapped/C_jakrppis;m_ecxgwxiu(Ljava/util/Collection;Lnet/minecraft/unmapped/C_cjzoxshv;)Z} + * @mapping {@literal named isCompatible Lnet/minecraft/enchantment/EnchantmentHelper;isCompatible(Ljava/util/Collection;Lnet/minecraft/registry/Holder;)Z} */ - public static boolean m_ecxgwxiu(Collection<Holder<Enchantment>> collection, Holder<Enchantment> arg) { - for (Holder<Enchantment> lv : collection) { - if (!Enchantment.m_ycasfcso(lv, arg)) { + public static boolean isCompatible(Collection<Holder<Enchantment>> currentEnchantments, Holder<Enchantment> newEnchantment) { + for (Holder<Enchantment> lv : currentEnchantments) { + if (!Enchantment.areCompatible(lv, newEnchantment)) { return false; } } @@ -740,16 +754,16 @@ /** * @mapping {@literal hashed m_pngonrhw Lnet/minecraft/unmapped/C_jakrppis;m_pngonrhw(ILnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/stream/Stream;)Ljava/util/List;} - * @mapping {@literal named m_pngonrhw Lnet/minecraft/enchantment/EnchantmentHelper;m_pngonrhw(ILnet/minecraft/item/ItemStack;Ljava/util/stream/Stream;)Ljava/util/List;} + * @mapping {@literal named getPossibleLevelEntries Lnet/minecraft/enchantment/EnchantmentHelper;getPossibleLevelEntries(ILnet/minecraft/item/ItemStack;Ljava/util/stream/Stream;)Ljava/util/List;} */ - public static List<EnchantmentLevelEntry> m_pngonrhw(int i, ItemStack stack, Stream<Holder<Enchantment>> stream) { + public static List<EnchantmentLevelEntry> getPossibleLevelEntries(int level, ItemStack stack, Stream<Holder<Enchantment>> possibleEnchantments) { List<EnchantmentLevelEntry> list = Lists.<EnchantmentLevelEntry>newArrayList(); boolean bl = stack.isOf(Items.BOOK); - stream.filter(arg2 -> ((Enchantment)arg2.value()).m_znzmqxec(stack) || bl).forEach(arg -> { + possibleEnchantments.filter(arg2 -> ((Enchantment)arg2.value()).isPrimaryItem(stack) || bl).forEach(arg -> { Enchantment lv = (Enchantment)arg.value(); for (int j = lv.getMaxLevel(); j >= lv.getMinLevel(); j--) { - if (i >= lv.getMinPower(j) && i <= lv.getMaxPower(j)) { + if (level >= lv.getMinPower(j) && level <= lv.getMaxPower(j)) { list.add(new EnchantmentLevelEntry(arg, j)); break; } @@ -760,38 +774,40 @@ /** * @mapping {@literal hashed m_spmqbsrk Lnet/minecraft/unmapped/C_jakrppis;m_spmqbsrk(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_jiailwzt;Lnet/minecraft/unmapped/C_rlomrsco;)V} - * @mapping {@literal named m_spmqbsrk Lnet/minecraft/enchantment/EnchantmentHelper;m_spmqbsrk(Lnet/minecraft/item/ItemStack;Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/world/LocalDifficulty;Lnet/minecraft/util/random/RandomGenerator;)V} + * @mapping {@literal named enchantFromProvider Lnet/minecraft/enchantment/EnchantmentHelper;enchantFromProvider(Lnet/minecraft/item/ItemStack;Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/world/LocalDifficulty;Lnet/minecraft/util/random/RandomGenerator;)V} */ - public static void m_spmqbsrk( - ItemStack stack, DynamicRegistryManager registryManager, RegistryKey<C_qraehchg> registryKey, LocalDifficulty arg4, RandomGenerator random + public static void enchantFromProvider( + ItemStack stack, DynamicRegistryManager registryManager, RegistryKey<EnchantmentProvider> registryKey, LocalDifficulty difficulty, RandomGenerator random ) { - C_qraehchg lv = registryManager.get(RegistryKeys.ENCHANTMENT_PROVIDER).get(registryKey); + EnchantmentProvider lv = registryManager.get(RegistryKeys.ENCHANTMENT_PROVIDER).get(registryKey); if (lv != null) { - m_iefpfmdo(stack, arg5 -> lv.m_mwqiigvy(stack, arg5, random, arg4)); + applyEnchantments(stack, arg5 -> lv.enchant(stack, arg5, random, difficulty)); } } /** - * @mapping {@literal hashed net/minecraft/unmapped/C_jakrppis$C_wtxpyhvg} - * @mapping {@literal named net/minecraft/enchantment/EnchantmentHelper$C_wtxpyhvg} + * @mapping {@literal hashed net/minecraft/unmapped/C_jakrppis$C_jdhxivxn} + * @mapping {@literal named net/minecraft/enchantment/EnchantmentHelper$Consumer} */ @FunctionalInterface - interface C_wtxpyhvg { + interface Consumer { /** - * Mapping not found + * @mapping {@literal hashed accept Lnet/minecraft/unmapped/C_jakrppis$C_jdhxivxn;accept(Lnet/minecraft/unmapped/C_cjzoxshv;I)V} + * @mapping {@literal named accept Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;accept(Lnet/minecraft/registry/Holder;I)V} */ - void accept(Holder<Enchantment> arg, int i, C_pjrjvgrp arg2); + void accept(Holder<Enchantment> enchantment, int level); } /** - * @mapping {@literal hashed net/minecraft/unmapped/C_jakrppis$C_jdhxivxn} - * @mapping {@literal named net/minecraft/enchantment/EnchantmentHelper$Consumer} + * @mapping {@literal hashed net/minecraft/unmapped/C_jakrppis$C_wtxpyhvg} + * @mapping {@literal named net/minecraft/enchantment/EnchantmentHelper$ContextAwareConsumer} */ @FunctionalInterface - interface Consumer { + interface ContextAwareConsumer { /** - * Mapping not found + * @mapping {@literal hashed accept Lnet/minecraft/unmapped/C_jakrppis$C_wtxpyhvg;accept(Lnet/minecraft/unmapped/C_cjzoxshv;ILnet/minecraft/unmapped/C_pjrjvgrp;)V} + * @mapping {@literal named accept Lnet/minecraft/enchantment/EnchantmentHelper$ContextAwareConsumer;accept(Lnet/minecraft/registry/Holder;ILnet/minecraft/enchantment/EnchantmentEffectContext;)V} */ - void accept(Holder<Enchantment> arg, int i); + void accept(Holder<Enchantment> enchantment, int level, EnchantmentEffectContext context); } } The remaining diff is too long!