You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
81cb7bcThere 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 81cb7bc, 237 file(s) were updated with 2223 line(s) added and 2056 removed compared to the latest Quilt Mappings version.
View the diff here (1/3):
81cb7bcThere 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):
81cb7bcThere 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!