Skip to content

Commit

Permalink
map MinecraftServer::getReloadableRegistries
Browse files Browse the repository at this point in the history
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Sep 1, 2024
1 parent 4f088b5 commit 7e66bb0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/MinecraftServer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
METHOD m_bchwkzcc addExtraSystemDetails (Lnet/minecraft/unmapped/C_fprbxnfr;)Lnet/minecraft/unmapped/C_fprbxnfr;
ARG 1 details
METHOD m_bdnrtaut isDemo ()Z
METHOD m_bilggnfr getReloadableRegistries ()Lnet/minecraft/unmapped/C_ihseotxf$C_hnvzydbq;
METHOD m_blfimkeo getLayeredRegistryManager ()Lnet/minecraft/unmapped/C_bcpxdrik;
METHOD m_btuswdlx getProxy ()Ljava/net/Proxy;
METHOD m_buftmakz getScoreboard ()Lnet/minecraft/unmapped/C_orszeavg;
Expand Down

1 comment on commit 7e66bb0

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 7e66bb0, 26 file(s) were updated with 41 line(s) added and 40 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-01 05:44:50.514150777 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-09-01 05:43:38.145757517 +0000
@@ -57,7 +57,7 @@
       boolean bl = false;
 
       for (RegistryKey<LootTable> lv2 : this.loot) {
-         for (ItemStack lv3 : player.server.m_bilggnfr().getLootTable(lv2).generateLoot(lv)) {
+         for (ItemStack lv3 : player.server.getReloadableRegistries().getLootTable(lv2).generateLoot(lv)) {
             if (player.giveItemStack(lv3)) {
                player.getWorld()
                   .playSound(
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2024-09-01 05:44:50.306149653 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-09-01 05:43:37.973756583 +0000
@@ -438,7 +438,7 @@
       } else {
          LootContextParameterSet lv2 = lootParameterBuilder.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
          ServerWorld lv3 = lv2.getWorld();
-         LootTable lv4 = lv3.getServer().m_bilggnfr().getLootTable(lv);
+         LootTable lv4 = lv3.getServer().getReloadableRegistries().getLootTable(lv);
          return lv4.generateLoot(lv2);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-01 05:44:50.478150583 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-09-01 05:43:38.117757366 +0000
@@ -163,7 +163,7 @@
     */
    public void checkLootInteraction(PlayerEntity player) {
       if (this.lootTableId != null && this.world != null && !this.world.isClient() && this.world.getServer() != null) {
-         LootTable lv = this.world.getServer().m_bilggnfr().getLootTable(this.lootTableId);
+         LootTable lv = this.world.getServer().getReloadableRegistries().getLootTable(this.lootTableId);
          if (player instanceof ServerPlayerEntity lv2) {
             Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger(lv2, this.lootTableId);
          }
diff -bur namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-09-01 05:44:50.410150216 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-09-01 05:43:38.057757040 +0000
@@ -470,7 +470,7 @@
        * @mapping {@literal named getRandomDisplayItem Lnet/minecraft/block/entity/vault/VaultBlockEntity$Server;getRandomDisplayItem(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/item/ItemStack;}
        */
       private static ItemStack getRandomDisplayItem(ServerWorld world, BlockPos pos, RegistryKey<LootTable> registryKey) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(registryKey);
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(registryKey);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
@@ -496,7 +496,7 @@
        * @mapping {@literal named getEjectionItems Lnet/minecraft/block/entity/vault/VaultBlockEntity$Server;getEjectionItems(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)Ljava/util/List;}
        */
       private static List<ItemStack> getEjectionItems(ServerWorld world, VaultConfig config, BlockPos pos, PlayerEntity player) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(config.lootTable());
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(config.lootTable());
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .withLuck(player.getLuck())
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-01 05:44:50.478150583 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-09-01 05:43:38.121757387 +0000
@@ -466,7 +466,7 @@
       if (this.lootPool != null) {
          return this.lootPool;
       } else {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(config.itemsToDropWhenOminous());
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(config.itemsToDropWhenOminous());
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world).build(LootContextTypes.EMPTY);
          long l = getLootSeed(world, pos);
          ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv2, l);
diff -bur namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java namedSrc/net/minecraft/command/EntitySelectorOptions.java
--- namedTargetSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-01 05:44:50.554150994 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-09-01 05:43:38.177757692 +0000
@@ -512,7 +512,7 @@
                      } else {
                         ServerWorld lvx = (ServerWorld)arg2.getWorld();
                         Optional<LootCondition> optional = lvx.getServer()
-                           .m_bilggnfr()
+                           .getReloadableRegistries()
                            .createLookupProvider()
                            .get(RegistryKeys.PREDICATE, lv)
                            .map(Holder::value);
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-01 05:44:50.478150583 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-09-01 05:43:38.121757387 +0000
@@ -127,7 +127,7 @@
    protected static LootTable.Builder sheepLootTableWith(ItemConvertible item) {
       return LootTable.builder()
          .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(ItemEntry.builder(item)))
-         .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(LootTableEntry.m_wboqiqkf(EntityType.SHEEP.getLootTableId())));
+         .pool(LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0F)).with(LootTableEntry.m_wboqiqkf(EntityType.SHEEP.getLootTable())));
    }
 
    /**
@@ -152,7 +152,7 @@
                if (lv.enabledIn(this.allowedFeatures)) {
                   if (canHaveLootTable(lv)) {
                      Map<RegistryKey<LootTable>, LootTable.Builder> map = (Map<RegistryKey<LootTable>, LootTable.Builder>)this.lootTables.remove(lv);
-                     RegistryKey<LootTable> lv2 = lv.getLootTableId();
+                     RegistryKey<LootTable> lv2 = lv.getLootTable();
                      if (lv2 != LootTables.EMPTY && lv.enabledIn(this.requiredFeatures) && (map == null || !map.containsKey(lv2))) {
                         throw new IllegalStateException(String.format(Locale.ROOT, "Missing loottable '%s' for '%s'", lv2, arg.getRegistryKey().getValue()));
                      }
@@ -229,7 +229,7 @@
     * @mapping {@literal named putLootTable Lnet/minecraft/data/server/loot_table/EntityLootTableGenerator;putLootTable(Lnet/minecraft/entity/EntityType;Lnet/minecraft/loot/LootTable$Builder;)V}
     */
    protected void putLootTable(EntityType<?> type, LootTable.Builder builder) {
-      this.m_znlvnkkb(type, type.getLootTableId(), builder);
+      this.m_znlvnkkb(type, type.getLootTable(), builder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-09-01 05:44:50.282149523 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveGiftsToHeroTask.java	2024-09-01 05:43:37.957756496 +0000
@@ -195,7 +195,7 @@
       } else {
          VillagerProfession lv = villager.getVillagerData().getProfession();
          if (GIFTS.containsKey(lv)) {
-            LootTable lv2 = villager.getWorld().getServer().m_bilggnfr().getLootTable((RegistryKey<LootTable>)GIFTS.get(lv));
+            LootTable lv2 = villager.getWorld().getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)GIFTS.get(lv));
             LootContextParameterSet lv3 = new LootContextParameterSet.Builder((ServerWorld)villager.getWorld())
                .add(LootContextParameters.ORIGIN, villager.getPos())
                .add(LootContextParameters.THIS_ENTITY, villager)
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-09-01 05:44:50.278149502 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-09-01 05:43:37.953756474 +0000
@@ -1634,10 +1634,10 @@
    private Text name;
    /**
     * @mapping {@literal hashed f_sjefpzeu Lnet/minecraft/unmapped/C_ogavsvbr;f_sjefpzeu:Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named lootTableId Lnet/minecraft/entity/EntityType;lootTableId:Lnet/minecraft/registry/RegistryKey;}
+    * @mapping {@literal named lootTable Lnet/minecraft/entity/EntityType;lootTable:Lnet/minecraft/registry/RegistryKey;}
     */
    @Nullable
-   private RegistryKey<LootTable> lootTableId;
+   private RegistryKey<LootTable> lootTable;
    /**
     * @mapping {@literal hashed f_lltgieqe Lnet/minecraft/unmapped/C_ogavsvbr;f_lltgieqe:Lnet/minecraft/unmapped/C_sszpscpo;}
     * @mapping {@literal named dimensions Lnet/minecraft/entity/EntityType;dimensions:Lnet/minecraft/entity/EntityDimensions;}
@@ -1935,15 +1935,15 @@
 
    /**
     * @mapping {@literal hashed m_qxlrmhco Lnet/minecraft/unmapped/C_ogavsvbr;m_qxlrmhco()Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named getLootTableId Lnet/minecraft/entity/EntityType;getLootTableId()Lnet/minecraft/registry/RegistryKey;}
+    * @mapping {@literal named getLootTable Lnet/minecraft/entity/EntityType;getLootTable()Lnet/minecraft/registry/RegistryKey;}
     */
-   public RegistryKey<LootTable> getLootTableId() {
-      if (this.lootTableId == null) {
+   public RegistryKey<LootTable> getLootTable() {
+      if (this.lootTable == null) {
          Identifier lv = Registries.ENTITY_TYPE.getId(this);
-         this.lootTableId = RegistryKey.of(RegistryKeys.LOOT_TABLE, lv.withPrefix("entities/"));
+         this.lootTable = RegistryKey.of(RegistryKeys.LOOT_TABLE, lv.withPrefix("entities/"));
       }
 
-      return this.lootTableId;
+      return this.lootTable;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/EquipmentUser.java namedSrc/net/minecraft/entity/EquipmentUser.java
--- namedTargetSrc/net/minecraft/entity/EquipmentUser.java	2024-09-01 05:44:50.378150042 +0000
+++ namedSrc/net/minecraft/entity/EquipmentUser.java	2024-09-01 05:43:38.029756887 +0000
@@ -56,7 +56,7 @@
     */
    default void equip(RegistryKey<LootTable> registryKey, LootContextParameterSet parameterSet, long seed, Map<EquipmentSlot, Float> dropChances) {
       if (!registryKey.equals(LootTables.EMPTY)) {
-         LootTable lv = parameterSet.getWorld().getServer().m_bilggnfr().getLootTable(registryKey);
+         LootTable lv = parameterSet.getWorld().getServer().getReloadableRegistries().getLootTable(registryKey);
          if (lv != LootTable.EMPTY) {
             List<ItemStack> list = lv.generateLoot(parameterSet, seed);
             List<EquipmentSlot> list2 = new ArrayList();
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-09-01 05:44:50.462150497 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-09-01 05:43:38.105757300 +0000
@@ -2335,7 +2335,7 @@
     * @mapping {@literal named getLootTable Lnet/minecraft/entity/LivingEntity;getLootTable()Lnet/minecraft/registry/RegistryKey;}
     */
    public RegistryKey<LootTable> getLootTable() {
-      return this.getType().getLootTableId();
+      return this.getType().getLootTable();
    }
 
    /**
@@ -2361,7 +2361,7 @@
     */
    protected void dropLoot(DamageSource source, boolean causedByPlayer) {
       RegistryKey<LootTable> lv = this.getLootTable();
-      LootTable lv2 = this.getWorld().getServer().m_bilggnfr().getLootTable(lv);
+      LootTable lv2 = this.getWorld().getServer().getReloadableRegistries().getLootTable(lv);
       LootContextParameterSet.Builder lv3 = new LootContextParameterSet.Builder((ServerWorld)this.getWorld())
          .add(LootContextParameters.THIS_ENTITY, this)
          .add(LootContextParameters.ORIGIN, this.getPos())
@@ -2382,7 +2382,7 @@
     */
    protected void m_pljlrlsh(RegistryKey<LootTable> registryKey, Consumer<ItemStack> consumer) {
       if (this.getWorld() instanceof ServerWorld lv) {
-         LootTable lv2 = lv.getServer().m_bilggnfr().getLootTable(registryKey);
+         LootTable lv2 = lv.getServer().getReloadableRegistries().getLootTable(registryKey);
          LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
             .add(LootContextParameters.ORIGIN, this.getPos())
             .add(LootContextParameters.THIS_ENTITY, this)
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java namedSrc/net/minecraft/entity/mob/PiglinBrain.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-09-01 05:44:50.574151102 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-09-01 05:43:38.193757778 +0000
@@ -705,7 +705,7 @@
     * @mapping {@literal named getBarteredItem Lnet/minecraft/entity/mob/PiglinBrain;getBarteredItem(Lnet/minecraft/entity/mob/PiglinEntity;)Ljava/util/List;}
     */
    private static List<ItemStack> getBarteredItem(PiglinEntity piglin) {
-      LootTable lv = piglin.getWorld().getServer().m_bilggnfr().getLootTable(LootTables.PIGLIN_BARTERING_GAMEPLAY);
+      LootTable lv = piglin.getWorld().getServer().getReloadableRegistries().getLootTable(LootTables.PIGLIN_BARTERING_GAMEPLAY);
       List<ItemStack> list = lv.generateLoot(
          new LootContextParameterSet.Builder((ServerWorld)piglin.getWorld()).add(LootContextParameters.THIS_ENTITY, piglin).build(LootContextTypes.BARTER)
       );
diff -bur namedTargetSrc/net/minecraft/entity/passive/CatEntity.java namedSrc/net/minecraft/entity/passive/CatEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/CatEntity.java	2024-09-01 05:44:50.306149653 +0000
+++ namedSrc/net/minecraft/entity/passive/CatEntity.java	2024-09-01 05:43:37.973756583 +0000
@@ -838,7 +838,7 @@
          this.cat
             .teleport((double)(lv2.getX() + lv.nextInt(11) - 5), (double)(lv2.getY() + lv.nextInt(5) - 2), (double)(lv2.getZ() + lv.nextInt(11) - 5), false);
          lv2.set(this.cat.getBlockPos());
-         LootTable lv3 = this.cat.getWorld().getServer().m_bilggnfr().getLootTable(LootTables.CAT_MORNING_GIFT_GAMEPLAY);
+         LootTable lv3 = this.cat.getWorld().getServer().getReloadableRegistries().getLootTable(LootTables.CAT_MORNING_GIFT_GAMEPLAY);
          LootContextParameterSet lv4 = new LootContextParameterSet.Builder((ServerWorld)this.cat.getWorld())
             .add(LootContextParameters.ORIGIN, this.cat.getPos())
             .add(LootContextParameters.THIS_ENTITY, this.cat)
diff -bur namedTargetSrc/net/minecraft/entity/passive/PandaEntity.java namedSrc/net/minecraft/entity/passive/PandaEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/PandaEntity.java	2024-09-01 05:44:50.534150886 +0000
+++ namedSrc/net/minecraft/entity/passive/PandaEntity.java	2024-09-01 05:43:38.161757604 +0000
@@ -839,7 +839,7 @@
 
       if (!lv2.isClient() && lv2.getGameRules().getBooleanValue(GameRules.DO_MOB_LOOT)) {
          ServerWorld lv4 = (ServerWorld)lv2;
-         LootTable lv5 = lv4.getServer().m_bilggnfr().getLootTable(LootTables.PANDA_SNEEZE_GAMEPLAY);
+         LootTable lv5 = lv4.getServer().getReloadableRegistries().getLootTable(LootTables.PANDA_SNEEZE_GAMEPLAY);
          LootContextParameterSet lv6 = new LootContextParameterSet.Builder(lv4)
             .add(LootContextParameters.ORIGIN, this.getPos())
             .add(LootContextParameters.THIS_ENTITY, this)
diff -bur namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java namedSrc/net/minecraft/entity/passive/SheepEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SheepEntity.java	2024-09-01 05:44:50.318149718 +0000
+++ namedSrc/net/minecraft/entity/passive/SheepEntity.java	2024-09-01 05:43:37.985756648 +0000
@@ -192,7 +192,7 @@
     */
    @Override
    public RegistryKey<LootTable> getLootTableId() {
-      return this.isSheared() ? this.getType().getLootTableId() : (RegistryKey)LootTables.f_lmifmzrj.get(this.getDyeColor());
+      return this.isSheared() ? this.getType().getLootTable() : (RegistryKey)LootTables.f_lmifmzrj.get(this.getDyeColor());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java namedSrc/net/minecraft/entity/passive/SnifferEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-09-01 05:44:50.410150216 +0000
+++ namedSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-09-01 05:43:38.061757061 +0000
@@ -421,7 +421,7 @@
    private void dropSeed() {
       if (!this.getWorld().isClient() && this.dataTracker.get(DROP_SEED_AT_TICK) == this.age) {
          ServerWorld lv = (ServerWorld)this.getWorld();
-         LootTable lv2 = lv.getServer().m_bilggnfr().getLootTable(LootTables.SNIFFER_DIGGING_GAMEPLAY);
+         LootTable lv2 = lv.getServer().getReloadableRegistries().getLootTable(LootTables.SNIFFER_DIGGING_GAMEPLAY);
          LootContextParameterSet lv3 = new LootContextParameterSet.Builder(lv)
             .add(LootContextParameters.ORIGIN, this.getHeadPosition())
             .add(LootContextParameters.THIS_ENTITY, this)
diff -bur namedTargetSrc/net/minecraft/entity/projectile/FishingBobberEntity.java namedSrc/net/minecraft/entity/projectile/FishingBobberEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/FishingBobberEntity.java	2024-09-01 05:44:50.346149869 +0000
+++ namedSrc/net/minecraft/entity/projectile/FishingBobberEntity.java	2024-09-01 05:43:38.005756757 +0000
@@ -614,7 +614,7 @@
                .add(LootContextParameters.THIS_ENTITY, this)
                .withLuck((float)this.luckOfTheSeaLevel + lv.getLuck())
                .build(LootContextTypes.FISHING);
-            LootTable lv3 = this.getWorld().getServer().m_bilggnfr().getLootTable(LootTables.FISHING_GAMEPLAY);
+            LootTable lv3 = this.getWorld().getServer().getReloadableRegistries().getLootTable(LootTables.FISHING_GAMEPLAY);
             List<ItemStack> list = lv3.generateLoot(lv2);
             Criteria.FISHING_ROD_HOOKED.trigger((ServerPlayerEntity)lv, usedItem, this, list);
 
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/StorageVehicle.java namedSrc/net/minecraft/entity/vehicle/StorageVehicle.java
--- namedTargetSrc/net/minecraft/entity/vehicle/StorageVehicle.java	2024-09-01 05:44:50.346149869 +0000
+++ namedSrc/net/minecraft/entity/vehicle/StorageVehicle.java	2024-09-01 05:43:38.005756757 +0000
@@ -168,7 +168,7 @@
    default void generateLoot(@Nullable PlayerEntity player) {
       MinecraftServer minecraftServer = this.getWorld().getServer();
       if (this.getLootTable() != null && minecraftServer != null) {
-         LootTable lv = minecraftServer.m_bilggnfr().getLootTable(this.getLootTable());
+         LootTable lv = minecraftServer.getReloadableRegistries().getLootTable(this.getLootTable());
          if (player != null) {
             Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger((ServerPlayerEntity)player, this.getLootTable());
          }
diff -bur namedTargetSrc/net/minecraft/inventory/LootableInventory.java namedSrc/net/minecraft/inventory/LootableInventory.java
--- namedTargetSrc/net/minecraft/inventory/LootableInventory.java	2024-09-01 05:44:50.538150907 +0000
+++ namedSrc/net/minecraft/inventory/LootableInventory.java	2024-09-01 05:43:38.169757648 +0000
@@ -140,7 +140,7 @@
       BlockPos lv2 = this.getPos();
       RegistryKey<LootTable> lv3 = this.getLootTableId();
       if (lv3 != null && lv != null && lv.getServer() != null) {
-         LootTable lv4 = lv.getServer().m_bilggnfr().getLootTable(lv3);
+         LootTable lv4 = lv.getServer().getReloadableRegistries().getLootTable(lv3);
          if (player instanceof ServerPlayerEntity) {
             Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger((ServerPlayerEntity)player, lv3);
          }
diff -bur namedTargetSrc/net/minecraft/loot/context/LootContext.java namedSrc/net/minecraft/loot/context/LootContext.java
--- namedTargetSrc/net/minecraft/loot/context/LootContext.java	2024-09-01 05:44:50.314149697 +0000
+++ namedSrc/net/minecraft/loot/context/LootContext.java	2024-09-01 05:43:37.981756626 +0000
@@ -229,7 +229,7 @@
          ServerWorld lv = this.getWorld();
          MinecraftServer minecraftServer = lv.getServer();
          RandomGenerator lv2 = (RandomGenerator)Optional.ofNullable(this.random).or(() -> optional.map(lv::getOrCreateRandom)).orElseGet(lv::getRandom);
-         return new LootContext(this.parameters, lv2, minecraftServer.m_bilggnfr().createLookupProvider());
+         return new LootContext(this.parameters, lv2, minecraftServer.getReloadableRegistries().createLookupProvider());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/server/command/ExecuteCommand.java namedSrc/net/minecraft/server/command/ExecuteCommand.java
--- namedTargetSrc/net/minecraft/server/command/ExecuteCommand.java	2024-09-01 05:44:50.586151167 +0000
+++ namedSrc/net/minecraft/server/command/ExecuteCommand.java	2024-09-01 05:43:38.205757843 +0000
@@ -159,7 +159,7 @@
     * Mapping not found
     */
    private static final SuggestionProvider<ServerCommandSource> f_csolxsjm = (context, builder) -> {
-      ReloadableRegistries.Holder lv = context.getSource().getServer().m_bilggnfr();
+      ReloadableRegistries.Holder lv = context.getSource().getServer().getReloadableRegistries();
       return CommandSource.suggestIdentifiers(lv.getIds(RegistryKeys.PREDICATE), builder);
    };
 
diff -bur namedTargetSrc/net/minecraft/server/command/ItemCommand.java namedSrc/net/minecraft/server/command/ItemCommand.java
--- namedTargetSrc/net/minecraft/server/command/ItemCommand.java	2024-09-01 05:44:50.474150561 +0000
+++ namedSrc/net/minecraft/server/command/ItemCommand.java	2024-09-01 05:43:38.117757366 +0000
@@ -91,7 +91,7 @@
     * @mapping {@literal named MODIFIER_SUGGESTION_PROVIDER Lnet/minecraft/server/command/ItemCommand;MODIFIER_SUGGESTION_PROVIDER:Lcom/mojang/brigadier/suggestion/SuggestionProvider;}
     */
    private static final SuggestionProvider<ServerCommandSource> MODIFIER_SUGGESTION_PROVIDER = (context, builder) -> {
-      ReloadableRegistries.Holder lv = context.getSource().getServer().m_bilggnfr();
+      ReloadableRegistries.Holder lv = context.getSource().getServer().getReloadableRegistries();
       return CommandSource.suggestIdentifiers(lv.getIds(RegistryKeys.ITEM_MODIFIER), builder);
    };
 
diff -bur namedTargetSrc/net/minecraft/server/command/LootCommand.java namedSrc/net/minecraft/server/command/LootCommand.java
--- namedTargetSrc/net/minecraft/server/command/LootCommand.java	2024-09-01 05:44:50.442150388 +0000
+++ namedSrc/net/minecraft/server/command/LootCommand.java	2024-09-01 05:43:38.093757235 +0000
@@ -52,7 +52,7 @@
     * @mapping {@literal named SUGGESTION_PROVIDER Lnet/minecraft/server/command/LootCommand;SUGGESTION_PROVIDER:Lcom/mojang/brigadier/suggestion/SuggestionProvider;}
     */
    public static final SuggestionProvider<ServerCommandSource> SUGGESTION_PROVIDER = (context, builder) -> {
-      ReloadableRegistries.Holder lv = context.getSource().getServer().m_bilggnfr();
+      ReloadableRegistries.Holder lv = context.getSource().getServer().getReloadableRegistries();
       return CommandSource.suggestIdentifiers(lv.getIds(RegistryKeys.LOOT_TABLE), builder);
    };
    /**
@@ -546,7 +546,7 @@
          lv3.add(LootContextParameters.THIS_ENTITY, entity);
          lv3.add(LootContextParameters.ORIGIN, lv2.getPosition());
          LootContextParameterSet lv6 = lv3.build(LootContextTypes.ENTITY);
-         LootTable lv7 = lv2.getServer().m_bilggnfr().getLootTable(lv);
+         LootTable lv7 = lv2.getServer().getReloadableRegistries().getLootTable(lv);
          List<ItemStack> list = lv7.generateLoot(lv6);
          return constructor.accept(context, list, feedback -> m_lqhmryxk(lv2, feedback, lv));
       }
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2024-09-01 05:44:50.530150864 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2024-09-01 05:43:38.157757583 +0000
@@ -3188,9 +3188,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bilggnfr Lnet/minecraft/server/MinecraftServer;m_bilggnfr()Lnet/minecraft/unmapped/C_ihseotxf$C_hnvzydbq;}
+    * @mapping {@literal named getReloadableRegistries Lnet/minecraft/server/MinecraftServer;getReloadableRegistries()Lnet/minecraft/registry/ReloadableRegistries$Holder;}
     */
-   public ReloadableRegistries.Holder m_bilggnfr() {
+   public ReloadableRegistries.Holder getReloadableRegistries() {
       return this.serverResourceManager.resources.getHolder();
    }
 
diff -bur namedTargetSrc/net/minecraft/world/RegistryWorldView.java namedSrc/net/minecraft/world/RegistryWorldView.java
--- namedTargetSrc/net/minecraft/world/RegistryWorldView.java	2024-09-01 05:44:50.562151037 +0000
+++ namedSrc/net/minecraft/world/RegistryWorldView.java	2024-09-01 05:43:38.181757713 +0000
@@ -35,8 +35,8 @@
     * Mapping not found
     */
    @Override
-   default boolean doesNotIntersectEntities(@Nullable Entity entity, VoxelShape shape) {
-      return EntityView.super.doesNotIntersectEntities(entity, shape);
+   default boolean doesNotIntersectEntities(@Nullable Entity except, VoxelShape shape) {
+      return EntityView.super.doesNotIntersectEntities(except, shape);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java namedSrc/net/minecraft/world/TrialSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-09-01 05:44:50.238149286 +0000
+++ namedSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-09-01 05:43:37.921756300 +0000
@@ -413,7 +413,7 @@
     * @mapping {@literal named ejectLoot Lnet/minecraft/world/TrialSpawnerLogic;ejectLoot(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/registry/RegistryKey;)V}
     */
    public void ejectLoot(ServerWorld world, BlockPos pos, RegistryKey<LootTable> registryKey) {
-      LootTable lv = world.getServer().m_bilggnfr().getLootTable(registryKey);
+      LootTable lv = world.getServer().getReloadableRegistries().getLootTable(registryKey);
       LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world).build(LootContextTypes.EMPTY);
       ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv2);
       if (!objectArrayList.isEmpty()) {

Please sign in to comment.