Skip to content

Commit

Permalink
Fix a couple loot-y things (#637)
Browse files Browse the repository at this point in the history 
* map MinecraftServer::getReloadableRegistries

* drop 'id' from get/LootTableId in EntityType

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@supersaiyansubtlety @github-actions
supersaiyansubtlety and github-actions[bot] authored Oct 6, 2024
1 parent b2aa2b7 commit a449f67
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/entity/Entity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity
METHOD m_kvxkjouy setFireTicks (I)V
ARG 1 ticks
METHOD m_kymkfjov isAttackable ()Z
METHOD m_lajughou getLootTable ()Ljava/util/Optional;
METHOD m_lfjmpwyp hasPlayerRider ()Z
METHOD m_lfpuwmgu removeAllPassengers ()V
METHOD m_lgmmhwrc hasPassenger (Lnet/minecraft/unmapped/C_astfners;)Z
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/entity/EntityType.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
FIELD f_mjmkeute requiredFlags Lnet/minecraft/unmapped/C_czxxrbcp;
FIELD f_nmhdwoib saveable Z
FIELD f_rbjzcosu summonable Z
FIELD f_sjefpzeu lootTableId Ljava/util/Optional;
FIELD f_sjefpzeu lootTable Ljava/util/Optional;
FIELD f_txgmkfug canSpawnInside Lcom/google/common/collect/ImmutableSet;
FIELD f_xwixcoto spawnGroup Lnet/minecraft/unmapped/C_ormqdxci;
FIELD f_yohcyxht fireImmune Z
Expand Down Expand Up @@ -80,7 +80,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType
METHOD m_qprblwyz isSaveable ()Z
METHOD m_qwgbrbqg createDefaultStackSpawnConfig (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jzrpycqo;)Ljava/util/function/Consumer;
ARG 2 player
METHOD m_qxlrmhco getLootTableId ()Ljava/util/Optional;
METHOD m_qxlrmhco getLootTable ()Ljava/util/Optional;
METHOD m_rdswxkej streamFromNbt (Ljava/util/List;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_bhyaesep;)Ljava/util/stream/Stream;
ARG 0 entityNbtList
ARG 1 world
Expand Down
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 @@ -107,6 +107,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 a449f67

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit a449f67, 22 file(s) were updated with 40 line(s) added and 38 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-10-06 04:43:52.802815815 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2024-10-06 04:42:39.687650993 +0000
@@ -58,7 +58,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-10-06 04:43:52.665815502 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2024-10-06 04:42:39.445650505 +0000
@@ -450,7 +450,7 @@
       } else {
          LootContextParameterSet lv = lootParameterBuilder.add(LootContextParameters.BLOCK_STATE, state).build(LootContextTypes.BLOCK);
          ServerWorld lv2 = lv.getWorld();
-         LootTable lv3 = lv2.getServer().m_bilggnfr().getLootTable((RegistryKey<LootTable>)this.lootTableId.get());
+         LootTable lv3 = lv2.getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)this.lootTableId.get());
          return lv3.generateLoot(lv);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-06 04:43:52.780815764 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-10-06 04:42:39.644650907 +0000
@@ -163,7 +163,7 @@
     */
    private void checkLootInteraction(ServerWorld world, PlayerEntity player, ItemStack stack) {
       if (this.lootTable != null) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(this.lootTable);
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(this.lootTable);
          if (player instanceof ServerPlayerEntity lv2) {
             Criteria.PLAYER_GENERATES_CONTAINER_LOOT.trigger(lv2, this.lootTable);
          }
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-10-06 04:43:52.737815666 +0000
+++ namedSrc/net/minecraft/block/entity/vault/VaultBlockEntity.java	2024-10-06 04:42:39.566650749 +0000
@@ -469,7 +469,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> key) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(key);
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(key);
          LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.ORIGIN, Vec3d.ofCenter(pos))
             .build(LootContextTypes.VAULT);
@@ -495,7 +495,7 @@
        * @mapping {@literal named m_rlrwoomb Lnet/minecraft/block/entity/vault/VaultBlockEntity$Server;m_rlrwoomb(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/block/entity/vault/VaultConfig;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;)Ljava/util/List;}
        */
       private static List<ItemStack> m_rlrwoomb(ServerWorld world, VaultConfig arg2, BlockPos pos, PlayerEntity player, ItemStack stack) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable(arg2.lootTable());
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable(arg2.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-10-06 04:43:52.780815764 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-10-06 04:42:39.645650908 +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-10-06 04:43:52.827815871 +0000
+++ namedSrc/net/minecraft/command/EntitySelectorOptions.java	2024-10-06 04:42:39.732651084 +0000
@@ -511,7 +511,7 @@
                         return false;
                      } else {
                         ServerWorld lvx = (ServerWorld)entity.getWorld();
-                        Optional<LootCondition> optional = lvx.getServer().m_bilggnfr().createLookupProvider().get(lv).map(Holder::getValue);
+                        Optional<LootCondition> optional = lvx.getServer().getReloadableRegistries().createLookupProvider().get(lv).map(Holder::getValue);
                         if (optional.isEmpty()) {
                            return false;
                         } else {
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-10-06 04:43:52.781815767 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/EntityLootTableGenerator.java	2024-10-06 04:42:39.646650911 +0000
@@ -152,7 +152,7 @@
             arg -> {
                EntityType<?> lv = (EntityType<?>)arg.getValue();
                if (lv.enabledIn(this.allowedFeatures)) {
-                  Optional<RegistryKey<LootTable>> optional = lv.getLootTableId();
+                  Optional<RegistryKey<LootTable>> optional = lv.getLootTable();
                   if (optional.isPresent()) {
                      Map<RegistryKey<LootTable>, LootTable.Builder> map = (Map<RegistryKey<LootTable>, LootTable.Builder>)this.lootTables.remove(lv);
                      if (lv.enabledIn(this.requiredFeatures) && (map == null || !map.containsKey(optional.get()))) {
@@ -226,7 +226,7 @@
     */
    protected void putLootTable(EntityType<?> key, LootTable.Builder builder) {
       this.putLootTable(
-         key, (RegistryKey<LootTable>)key.getLootTableId().orElseThrow(() -> new IllegalStateException("Entity " + key + " has no loot table")), builder
+         key, (RegistryKey<LootTable>)key.getLootTable().orElseThrow(() -> new IllegalStateException("Entity " + key + " has no loot table")), builder
       );
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/Entity.java namedSrc/net/minecraft/entity/Entity.java
--- namedTargetSrc/net/minecraft/entity/Entity.java	2024-10-06 04:43:52.796815801 +0000
+++ namedSrc/net/minecraft/entity/Entity.java	2024-10-06 04:42:39.671650961 +0000
@@ -6014,10 +6014,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lajughou Lnet/minecraft/unmapped/C_astfners;m_lajughou()Ljava/util/Optional;}
+    * @mapping {@literal named getLootTable Lnet/minecraft/entity/Entity;getLootTable()Ljava/util/Optional;}
     */
-   public Optional<RegistryKey<LootTable>> m_lajughou() {
-      return this.type.getLootTableId();
+   public Optional<RegistryKey<LootTable>> getLootTable() {
+      return this.type.getLootTable();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-10-06 04:43:52.645815456 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-10-06 04:42:39.418650451 +0000
@@ -1954,9 +1954,9 @@
    private Text name;
    /**
     * @mapping {@literal hashed f_sjefpzeu Lnet/minecraft/unmapped/C_ogavsvbr;f_sjefpzeu:Ljava/util/Optional;}
-    * @mapping {@literal named lootTableId Lnet/minecraft/entity/EntityType;lootTableId:Ljava/util/Optional;}
+    * @mapping {@literal named lootTable Lnet/minecraft/entity/EntityType;lootTable:Ljava/util/Optional;}
     */
-   private final Optional<RegistryKey<LootTable>> lootTableId;
+   private final Optional<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;}
@@ -2030,7 +2030,7 @@
       int maxTrackDistance,
       int trackTickInterval,
       String translationKey,
-      Optional<RegistryKey<LootTable>> lootTableId,
+      Optional<RegistryKey<LootTable>> lootTable,
       FeatureFlagBitSet requiredFlags
    ) {
       this.factory = factory;
@@ -2045,7 +2045,7 @@
       this.maxTrackDistance = maxTrackDistance;
       this.trackTickInterval = trackTickInterval;
       this.translationKey = translationKey;
-      this.lootTableId = lootTableId;
+      this.lootTable = lootTable;
       this.requiredFlags = requiredFlags;
    }
 
@@ -2270,10 +2270,10 @@
 
    /**
     * @mapping {@literal hashed m_qxlrmhco Lnet/minecraft/unmapped/C_ogavsvbr;m_qxlrmhco()Ljava/util/Optional;}
-    * @mapping {@literal named getLootTableId Lnet/minecraft/entity/EntityType;getLootTableId()Ljava/util/Optional;}
+    * @mapping {@literal named getLootTable Lnet/minecraft/entity/EntityType;getLootTable()Ljava/util/Optional;}
     */
-   public Optional<RegistryKey<LootTable>> getLootTableId() {
-      return this.lootTableId;
+   public Optional<RegistryKey<LootTable>> getLootTable() {
+      return this.lootTable;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/EquipmentUser.java namedSrc/net/minecraft/entity/EquipmentUser.java
--- namedTargetSrc/net/minecraft/entity/EquipmentUser.java	2024-10-06 04:43:52.719815625 +0000
+++ namedSrc/net/minecraft/entity/EquipmentUser.java	2024-10-06 04:42:39.529650674 +0000
@@ -55,7 +55,7 @@
     * @mapping {@literal named equipRandomly Lnet/minecraft/entity/EquipmentUser;equipRandomly(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/loot/context/LootContextParameterSet;JLjava/util/Map;)V}
     */
    default void equipRandomly(RegistryKey<LootTable> lootTable, LootContextParameterSet parameterSet, long seed, Map<EquipmentSlot, Float> dropChances) {
-      LootTable lv = parameterSet.getWorld().getServer().m_bilggnfr().getLootTable(lootTable);
+      LootTable lv = parameterSet.getWorld().getServer().getReloadableRegistries().getLootTable(lootTable);
       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-10-06 04:43:52.772815746 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-10-06 04:42:39.629650876 +0000
@@ -2353,9 +2353,9 @@
     * @mapping {@literal named m_oymopclz Lnet/minecraft/entity/LivingEntity;m_oymopclz(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/damage/DamageSource;Z)V}
     */
    protected void m_oymopclz(ServerWorld world, DamageSource value, boolean bl) {
-      Optional<RegistryKey<LootTable>> optional = this.m_lajughou();
+      Optional<RegistryKey<LootTable>> optional = this.getLootTable();
       if (!optional.isEmpty()) {
-         LootTable lv = world.getServer().m_bilggnfr().getLootTable((RegistryKey<LootTable>)optional.get());
+         LootTable lv = world.getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)optional.get());
          LootContextParameterSet.Builder lv2 = new LootContextParameterSet.Builder(world)
             .add(LootContextParameters.THIS_ENTITY, this)
             .add(LootContextParameters.ORIGIN, this.getPos())
@@ -2410,7 +2410,7 @@
       Function<LootContextParameterSet.Builder, LootContextParameterSet> function,
       BiConsumer<ServerWorld, ItemStack> biConsumer
    ) {
-      LootTable lv = world.getServer().m_bilggnfr().getLootTable(key);
+      LootTable lv = world.getServer().getReloadableRegistries().getLootTable(key);
       LootContextParameterSet lv2 = (LootContextParameterSet)function.apply(new LootContextParameterSet.Builder(world));
       List<ItemStack> list = lv.generateLoot(lv2);
       if (!list.isEmpty()) {
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobEntity.java namedSrc/net/minecraft/entity/mob/MobEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-06 04:43:52.744815682 +0000
+++ namedSrc/net/minecraft/entity/mob/MobEntity.java	2024-10-06 04:42:39.577650772 +0000
@@ -825,8 +825,8 @@
     * Mapping not found
     */
    @Override
-   public final Optional<RegistryKey<LootTable>> m_lajughou() {
-      return this.lootTable.isPresent() ? this.lootTable : super.m_lajughou();
+   public final Optional<RegistryKey<LootTable>> getLootTable() {
+      return this.lootTable.isPresent() ? this.lootTable : super.getLootTable();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java namedSrc/net/minecraft/entity/mob/PiglinBrain.java
--- namedTargetSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-10-06 04:43:52.840815901 +0000
+++ namedSrc/net/minecraft/entity/mob/PiglinBrain.java	2024-10-06 04:42:39.752651124 +0000
@@ -703,7 +703,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/projectile/FishingBobberEntity.java namedSrc/net/minecraft/entity/projectile/FishingBobberEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/FishingBobberEntity.java	2024-10-06 04:43:52.694815568 +0000
+++ namedSrc/net/minecraft/entity/projectile/FishingBobberEntity.java	2024-10-06 04:42:39.491650598 +0000
@@ -611,7 +611,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-10-06 04:43:52.695815570 +0000
+++ namedSrc/net/minecraft/entity/vehicle/StorageVehicle.java	2024-10-06 04:42:39.493650602 +0000
@@ -166,7 +166,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-10-06 04:43:52.819815853 +0000
+++ namedSrc/net/minecraft/inventory/LootableInventory.java	2024-10-06 04:42:39.718651056 +0000
@@ -140,7 +140,7 @@
       BlockPos lv2 = this.getPos();
       RegistryKey<LootTable> lv3 = this.getLootTable();
       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-10-06 04:43:52.672815518 +0000
+++ namedSrc/net/minecraft/loot/context/LootContext.java	2024-10-06 04:42:39.456650527 +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-10-06 04:43:52.849815922 +0000
+++ namedSrc/net/minecraft/server/command/ExecuteCommand.java	2024-10-06 04:42:39.766651153 +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-10-06 04:43:52.779815762 +0000
+++ namedSrc/net/minecraft/server/command/ItemCommand.java	2024-10-06 04:42:39.643650905 +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-10-06 04:43:52.759815716 +0000
+++ namedSrc/net/minecraft/server/command/LootCommand.java	2024-10-06 04:42:39.606650830 +0000
@@ -53,7 +53,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);
    };
    /**
@@ -536,7 +536,7 @@
     * @mapping {@literal named executeKill Lnet/minecraft/server/command/LootCommand;executeKill(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/entity/Entity;Lnet/minecraft/server/command/LootCommand$Target;)I}
     */
    private static int executeKill(CommandContext<ServerCommandSource> context, Entity entity, LootCommand.Target constructor) throws CommandSyntaxException {
-      Optional<RegistryKey<LootTable>> optional = entity.m_lajughou();
+      Optional<RegistryKey<LootTable>> optional = entity.getLootTable();
       if (optional.isEmpty()) {
          throw f_hwydcpjk.create(entity.getDisplayName());
       } else {
@@ -553,7 +553,7 @@
          lv2.add(LootContextParameters.THIS_ENTITY, entity);
          lv2.add(LootContextParameters.ORIGIN, lv.getPosition());
          LootContextParameterSet lv5 = lv2.build(LootContextTypes.ENTITY);
-         LootTable lv6 = lv.getServer().m_bilggnfr().getLootTable((RegistryKey<LootTable>)optional.get());
+         LootTable lv6 = lv.getServer().getReloadableRegistries().getLootTable((RegistryKey<LootTable>)optional.get());
          List<ItemStack> list = lv6.generateLoot(lv5);
          return constructor.accept(context, list, listx -> m_lqhmryxk(lv, listx, (RegistryKey<LootTable>)optional.get()));
       }
diff -bur namedTargetSrc/net/minecraft/server/MinecraftServer.java namedSrc/net/minecraft/server/MinecraftServer.java
--- namedTargetSrc/net/minecraft/server/MinecraftServer.java	2024-10-06 04:43:52.811815835 +0000
+++ namedSrc/net/minecraft/server/MinecraftServer.java	2024-10-06 04:42:39.704651028 +0000
@@ -3189,9 +3189,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/TrialSpawnerLogic.java namedSrc/net/minecraft/world/TrialSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-10-06 04:43:52.612815381 +0000
+++ namedSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-10-06 04:42:39.346650306 +0000
@@ -408,7 +408,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> lootTable) {
-      LootTable lv = world.getServer().m_bilggnfr().getLootTable(lootTable);
+      LootTable lv = world.getServer().getReloadableRegistries().getLootTable(lootTable);
       LootContextParameterSet lv2 = new LootContextParameterSet.Builder(world).build(LootContextTypes.EMPTY);
       ObjectArrayList<ItemStack> objectArrayList = lv.generateLoot(lv2);
       if (!objectArrayList.isEmpty()) {

Please sign in to comment.