Skip to content

Commit

Permalink
Map LootableInventory (#519)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kneelawk @moehreag
Kneelawk authored and moehreag committed Dec 23, 2023
1 parent 9828a5f commit 6f69ed5
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions mappings/net/minecraft/inventory/LootableInventory.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CLASS net/minecraft/unmapped/C_ehawoasn net/minecraft/inventory/LootableInventory
FIELD f_yeibkfzd LOOT_TABLE_SEED_KEY Ljava/lang/String;
FIELD f_ztchflsp LOOT_TABLE_KEY Ljava/lang/String;
METHOD m_canflxyp setLootTableId (Lnet/minecraft/unmapped/C_ncpywfca;)V
METHOD m_drfdhyfv getLootTableId ()Lnet/minecraft/unmapped/C_ncpywfca;
METHOD m_mtzsyvbu setupLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V
METHOD m_njtcujiz readLootTableNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z
METHOD m_qihknhoq getPos ()Lnet/minecraft/unmapped/C_hynzadkk;
METHOD m_rtxjwbev getWorld ()Lnet/minecraft/unmapped/C_cdctfzbn;
METHOD m_ssvygaxw setupLootTable (Lnet/minecraft/unmapped/C_ncpywfca;J)V
METHOD m_ubdtdnuf setLootTableSeed (J)V
METHOD m_uxrpqxab getLootTableSeed ()J
METHOD m_vhsehsrn setupLootTable (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ncpywfca;)V
METHOD m_ycwokqel writeLootTableNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z

1 comment on commit 6f69ed5

@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 6f69ed5, 23 file(s) were updated with 68 line(s) added and 67 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/block/ChestBlock.java namedSrc/net/minecraft/block/ChestBlock.java
--- namedTargetSrc/net/minecraft/block/ChestBlock.java	2023-12-23 16:46:59.162565155 +0000
+++ namedSrc/net/minecraft/block/ChestBlock.java	2023-12-23 16:45:56.726858330 +0000
@@ -169,8 +169,8 @@
             @Override
             public ScreenHandler createMenu(int i, PlayerInventory arg, PlayerEntity arg2) {
                if (arg.checkUnlocked(arg2) && arg2.checkUnlocked(arg2)) {
-                  arg.m_mtzsyvbu(arg.player);
-                  arg2.m_mtzsyvbu(arg.player);
+                  arg.setupLoot(arg.player);
+                  arg2.setupLoot(arg.player);
                   return GenericContainerScreenHandler.createGeneric9x6(i, arg, lv);
                } else {
                   return null;
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2023-12-23 16:46:59.182565079 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2023-12-23 16:45:56.746858245 +0000
@@ -89,7 +89,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.inventory);
       }
    }
@@ -101,7 +101,7 @@
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          Inventories.readNbt(nbt, this.inventory);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java namedSrc/net/minecraft/block/entity/ChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java	2023-12-23 16:46:59.110565354 +0000
+++ namedSrc/net/minecraft/block/entity/ChestBlockEntity.java	2023-12-23 16:45:56.690858480 +0000
@@ -125,7 +125,7 @@
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          Inventories.readNbt(nbt, this.inventory);
       }
    }
@@ -136,7 +136,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.inventory);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2023-12-23 16:46:59.142565231 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2023-12-23 16:45:56.710858396 +0000
@@ -3,6 +3,7 @@
 import java.util.stream.Stream;
 import net.minecraft.block.BlockState;
 import net.minecraft.inventory.JukeboxInventory;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -14,7 +15,6 @@
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.Registries;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -24,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_snnddtnv}
  * @mapping {@literal named net/minecraft/block/entity/DecoratedPotBlockEntity}
  */
-public class DecoratedPotBlockEntity extends BlockEntity implements C_ehawoasn, JukeboxInventory {
+public class DecoratedPotBlockEntity extends BlockEntity implements LootableInventory, JukeboxInventory {
    /**
     * @mapping {@literal hashed f_lkaissqj Lnet/minecraft/unmapped/C_snnddtnv;f_lkaissqj:Ljava/lang/String;}
     * @mapping {@literal named SHERDS_KEY Lnet/minecraft/block/entity/DecoratedPotBlockEntity;SHERDS_KEY:Ljava/lang/String;}
@@ -83,7 +83,7 @@
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
       this.sherds.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt) && !this.stack.isEmpty()) {
+      if (!this.writeLootTableNbt(nbt) && !this.stack.isEmpty()) {
          nbt.put("item", this.stack.writeNbt(new NbtCompound()));
       }
    }
@@ -95,7 +95,7 @@
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
       this.sherds = DecoratedPotBlockEntity.Sherds.readNbt(nbt);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          if (nbt.contains("item", NbtElement.COMPOUND_TYPE)) {
             this.stack = ItemStack.fromNbt(nbt.getCompound("item"));
          } else {
@@ -166,7 +166,7 @@
     */
    @Nullable
    @Override
-   public Identifier m_drfdhyfv() {
+   public Identifier getLootTableId() {
       return this.f_dwwkwusv;
    }
 
@@ -174,7 +174,7 @@
     * Mapping not found
     */
    @Override
-   public void m_canflxyp(@Nullable Identifier arg) {
+   public void setLootTableId(@Nullable Identifier arg) {
       this.f_dwwkwusv = arg;
    }
 
@@ -182,7 +182,7 @@
     * Mapping not found
     */
    @Override
-   public long m_uxrpqxab() {
+   public long getLootTableSeed() {
       return this.f_skwmykui;
    }
 
@@ -190,7 +190,7 @@
     * Mapping not found
     */
    @Override
-   public void m_ubdtdnuf(long l) {
+   public void setLootTableSeed(long l) {
       this.f_skwmykui = l;
    }
 
@@ -199,7 +199,7 @@
     */
    @Override
    public ItemStack m_xwjsgxrp() {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       return this.stack;
    }
 
@@ -208,7 +208,7 @@
     */
    @Override
    public ItemStack m_htpnuxlo(int i) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       ItemStack lv = this.stack.split(i);
       if (this.stack.isEmpty()) {
          this.stack = ItemStack.EMPTY;
@@ -223,7 +223,7 @@
     */
    @Override
    public void m_bkmnewbu(ItemStack stack) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       this.stack = stack;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2023-12-23 16:46:59.102565383 +0000
+++ namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2023-12-23 16:45:56.678858530 +0000
@@ -56,7 +56,7 @@
     * @mapping {@literal named chooseNonEmptySlot Lnet/minecraft/block/entity/DispenserBlockEntity;chooseNonEmptySlot(Lnet/minecraft/util/random/RandomGenerator;)I}
     */
    public int chooseNonEmptySlot(RandomGenerator random) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       int i = -1;
       int j = 1;
 
@@ -99,7 +99,7 @@
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          Inventories.readNbt(nbt, this.inventory);
       }
    }
@@ -110,7 +110,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.inventory);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2023-12-23 16:46:58.962565918 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2023-12-23 16:45:56.566858999 +0000
@@ -76,7 +76,7 @@
    public void readNbt(NbtCompound nbt) {
       super.readNbt(nbt);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          Inventories.readNbt(nbt, this.inventory);
       }
 
@@ -89,7 +89,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.inventory);
       }
 
@@ -109,7 +109,7 @@
     */
    @Override
    public ItemStack removeStack(int slot, int amount) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       return Inventories.splitStack(this.getInvStackList(), slot, amount);
    }
 
@@ -118,7 +118,7 @@
     */
    @Override
    public void setStack(int slot, ItemStack stack) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       this.getInvStackList().set(slot, stack);
       if (stack.getCount() > this.getMaxCountPerStack()) {
          stack.setCount(this.getMaxCountPerStack());
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2023-12-23 16:46:58.998565781 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2023-12-23 16:45:56.594858881 +0000
@@ -5,9 +5,9 @@
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.ScreenHandler;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
@@ -17,7 +17,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_awquuxeb}
  * @mapping {@literal named net/minecraft/block/entity/LootableContainerBlockEntity}
  */
-public abstract class LootableContainerBlockEntity extends LockableContainerBlockEntity implements C_ehawoasn {
+public abstract class LootableContainerBlockEntity extends LockableContainerBlockEntity implements LootableInventory {
    /**
     * @mapping {@literal hashed f_jpgmzqwu Lnet/minecraft/unmapped/C_awquuxeb;f_jpgmzqwu:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named lootTableId Lnet/minecraft/block/entity/LootableContainerBlockEntity;lootTableId:Lnet/minecraft/util/Identifier;}
@@ -42,7 +42,7 @@
     */
    @Nullable
    @Override
-   public Identifier m_drfdhyfv() {
+   public Identifier getLootTableId() {
       return this.lootTableId;
    }
 
@@ -50,7 +50,7 @@
     * Mapping not found
     */
    @Override
-   public void m_canflxyp(@Nullable Identifier arg) {
+   public void setLootTableId(@Nullable Identifier arg) {
       this.lootTableId = arg;
    }
 
@@ -58,7 +58,7 @@
     * Mapping not found
     */
    @Override
-   public long m_uxrpqxab() {
+   public long getLootTableSeed() {
       return this.lootTableSeed;
    }
 
@@ -66,7 +66,7 @@
     * Mapping not found
     */
    @Override
-   public void m_ubdtdnuf(long l) {
+   public void setLootTableSeed(long l) {
       this.lootTableSeed = l;
    }
 
@@ -75,7 +75,7 @@
     */
    @Override
    public boolean isEmpty() {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       return this.getInvStackList().stream().allMatch(ItemStack::isEmpty);
    }
 
@@ -84,7 +84,7 @@
     */
    @Override
    public ItemStack getStack(int slot) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       return this.getInvStackList().get(slot);
    }
 
@@ -93,7 +93,7 @@
     */
    @Override
    public ItemStack removeStack(int slot, int amount) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       ItemStack lv = Inventories.splitStack(this.getInvStackList(), slot, amount);
       if (!lv.isEmpty()) {
          this.markDirty();
@@ -107,7 +107,7 @@
     */
    @Override
    public ItemStack removeStack(int slot) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       return Inventories.removeStack(this.getInvStackList(), slot);
    }
 
@@ -116,7 +116,7 @@
     */
    @Override
    public void setStack(int slot, ItemStack stack) {
-      this.m_mtzsyvbu(null);
+      this.setupLoot(null);
       this.getInvStackList().set(slot, stack);
       if (stack.getCount() > this.getMaxCountPerStack()) {
          stack.setCount(this.getMaxCountPerStack());
@@ -168,7 +168,7 @@
    @Override
    public ScreenHandler createMenu(int i, PlayerInventory arg, PlayerEntity arg2) {
       if (this.checkUnlocked(arg2)) {
-         this.m_mtzsyvbu(arg.player);
+         this.setupLoot(arg.player);
          return this.createScreenHandler(i, arg);
       } else {
          return null;
diff -bur namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2023-12-23 16:46:59.086565445 +0000
+++ namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2023-12-23 16:45:56.662858598 +0000
@@ -318,7 +318,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.inventory, false);
       }
    }
@@ -329,7 +329,7 @@
     */
    public void readInventoryNbt(NbtCompound nbt) {
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt) && nbt.contains("Items", NbtElement.LIST_TYPE)) {
+      if (!this.readLootTableNbt(nbt) && nbt.contains("Items", NbtElement.LIST_TYPE)) {
          Inventories.readNbt(nbt, this.inventory);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-12-23 16:46:59.102565383 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-12-23 16:45:56.678858530 +0000
@@ -241,7 +241,7 @@
             lv4.setToDefaultPickupDelay();
             world.spawnEntity(lv4);
          } else {
-            lv2.m_mtzsyvbu(player);
+            lv2.setupLoot(player);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-12-23 16:46:58.982565842 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-12-23 16:45:56.586858915 +0000
@@ -740,7 +740,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-12-23 16:46:59.178565094 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-12-23 16:45:56.746858245 +0000
@@ -336,13 +336,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-23 16:46:58.962565918 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-23 16:45:56.570858982 +0000
@@ -596,8 +596,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.getY() && mouseY <= (double)this.m_tovfilfx() && mouseX >= (double)this.getX() && mouseX <= (double)this.m_cgsapias();
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.getY() && e <= (double)this.m_tovfilfx() && d >= (double)this.getX() && d <= (double)this.m_cgsapias();
    }
 
    /**
@@ -862,8 +862,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-23 16:46:59.058565551 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-23 16:45:56.638858697 +0000
@@ -242,7 +242,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-12-23 16:46:59.198565018 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-12-23 16:45:56.750858229 +0000
@@ -637,7 +637,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
Only in namedSrc/net/minecraft/inventory: LootableInventory.java
diff -bur namedTargetSrc/net/minecraft/structure/EndCityGenerator.java namedSrc/net/minecraft/structure/EndCityGenerator.java
--- namedTargetSrc/net/minecraft/structure/EndCityGenerator.java	2023-12-23 16:46:59.078565476 +0000
+++ namedSrc/net/minecraft/structure/EndCityGenerator.java	2023-12-23 16:45:56.654858631 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.decoration.ItemFrameEntity;
 import net.minecraft.entity.mob.ShulkerEntity;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.loot.LootTables;
@@ -14,7 +15,6 @@
 import net.minecraft.structure.piece.StructurePieceSerializationContext;
 import net.minecraft.structure.piece.StructurePieceType;
 import net.minecraft.structure.processor.BlockIgnoreStructureProcessor;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Pair;
@@ -495,7 +495,7 @@
          if (metadata.startsWith("Chest")) {
             BlockPos lv = pos.down();
             if (boundingBox.isInside(lv)) {
-               C_ehawoasn.m_vhsehsrn(world, random, lv, LootTables.END_CITY_TREASURE_CHEST);
+               LootableInventory.setupLootTable(world, random, lv, LootTables.END_CITY_TREASURE_CHEST);
             }
          } else if (boundingBox.isInside(pos) && World.isValid(pos)) {
             if (metadata.startsWith("Sentry")) {
diff -bur namedTargetSrc/net/minecraft/structure/IglooGenerator.java namedSrc/net/minecraft/structure/IglooGenerator.java
--- namedTargetSrc/net/minecraft/structure/IglooGenerator.java	2023-12-23 16:46:59.210564972 +0000
+++ namedSrc/net/minecraft/structure/IglooGenerator.java	2023-12-23 16:45:56.758858196 +0000
@@ -153,7 +153,7 @@
             world.setBlockState(pos, Blocks.AIR.getDefaultState(), Block.NOTIFY_ALL);
             BlockEntity lv = world.getBlockEntity(pos.down());
             if (lv instanceof ChestBlockEntity) {
-               ((ChestBlockEntity)lv).m_ssvygaxw(LootTables.IGLOO_CHEST_CHEST, random.nextLong());
+               ((ChestBlockEntity)lv).setupLootTable(LootTables.IGLOO_CHEST_CHEST, random.nextLong());
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/structure/OceanRuinGenerator.java namedSrc/net/minecraft/structure/OceanRuinGenerator.java
--- namedTargetSrc/net/minecraft/structure/OceanRuinGenerator.java	2023-12-23 16:46:59.058565551 +0000
+++ namedSrc/net/minecraft/structure/OceanRuinGenerator.java	2023-12-23 16:45:56.642858681 +0000
@@ -407,7 +407,8 @@
             );
             BlockEntity lv = world.getBlockEntity(pos);
             if (lv instanceof ChestBlockEntity) {
-               ((ChestBlockEntity)lv).m_ssvygaxw(this.large ? LootTables.UNDERWATER_RUIN_BIG_CHEST : LootTables.UNDERWATER_RUIN_SMALL_CHEST, random.nextLong());
+               ((ChestBlockEntity)lv)
+                  .setupLootTable(this.large ? LootTables.UNDERWATER_RUIN_BIG_CHEST : LootTables.UNDERWATER_RUIN_SMALL_CHEST, random.nextLong());
             }
          } else if ("drowned".equals(metadata)) {
             DrownedEntity lv2 = EntityType.DROWNED.create(world.toServerWorld());
diff -bur namedTargetSrc/net/minecraft/structure/piece/StructurePiece.java namedSrc/net/minecraft/structure/piece/StructurePiece.java
--- namedTargetSrc/net/minecraft/structure/piece/StructurePiece.java	2023-12-23 16:46:59.050565582 +0000
+++ namedSrc/net/minecraft/structure/piece/StructurePiece.java	2023-12-23 16:45:56.630858731 +0000
@@ -646,7 +646,7 @@
          world.setBlockState(pos, blockState, Block.NOTIFY_LISTENERS);
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof ChestBlockEntity) {
-            ((ChestBlockEntity)lv).m_ssvygaxw(lootTableId, random.nextLong());
+            ((ChestBlockEntity)lv).setupLootTable(lootTableId, random.nextLong());
          }
 
          return true;
@@ -667,7 +667,7 @@
          this.addBlock(world, Blocks.DISPENSER.getDefaultState().with(DispenserBlock.FACING, facing), x, y, z, boundingBox);
          BlockEntity lv2 = world.getBlockEntity(lv);
          if (lv2 instanceof DispenserBlockEntity) {
-            ((DispenserBlockEntity)lv2).m_ssvygaxw(lootTableId, random.nextLong());
+            ((DispenserBlockEntity)lv2).setupLootTable(lootTableId, random.nextLong());
          }
 
          return true;
diff -bur namedTargetSrc/net/minecraft/structure/ShipwreckGenerator.java namedSrc/net/minecraft/structure/ShipwreckGenerator.java
--- namedTargetSrc/net/minecraft/structure/ShipwreckGenerator.java	2023-12-23 16:46:59.026565674 +0000
+++ namedSrc/net/minecraft/structure/ShipwreckGenerator.java	2023-12-23 16:45:56.614858798 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.structure;
 
 import java.util.Map;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.loot.LootTables;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.structure.piece.SimpleStructurePiece;
@@ -8,7 +9,6 @@
 import net.minecraft.structure.piece.StructurePieceType;
 import net.minecraft.structure.piece.StructurePiecesHolder;
 import net.minecraft.structure.processor.BlockIgnoreStructureProcessor;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Identifier;
@@ -158,7 +158,7 @@
       protected void handleMetadata(String metadata, BlockPos pos, ServerWorldAccess world, RandomGenerator random, BlockBox boundingBox) {
          Identifier lv = (Identifier)ShipwreckGenerator.LOOT_TABLES.get(metadata);
          if (lv != null) {
-            C_ehawoasn.m_vhsehsrn(world, random, pos.down(), lv);
+            LootableInventory.setupLootTable(world, random, pos.down(), lv);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/structure/Structure.java namedSrc/net/minecraft/structure/Structure.java
--- namedTargetSrc/net/minecraft/structure/Structure.java	2023-12-23 16:46:59.106565369 +0000
+++ namedSrc/net/minecraft/structure/Structure.java	2023-12-23 16:45:56.682858514 +0000
@@ -25,6 +25,7 @@
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtDouble;
 import net.minecraft.nbt.NbtElement;
@@ -33,7 +34,6 @@
 import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.HolderProvider;
 import net.minecraft.structure.processor.StructureProcessor;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Clearable;
@@ -354,7 +354,7 @@
                      if (lv2.nbt != null) {
                         BlockEntity lv7 = world.getBlockEntity(lv3);
                         if (lv7 != null) {
-                           if (lv7 instanceof C_ehawoasn) {
+                           if (lv7 instanceof LootableInventory) {
                               lv2.nbt.putLong("LootTableSeed", random.nextLong());
                            }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_ehawoasn.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_lamqkfie.java namedSrc/net/minecraft/unmapped/C_lamqkfie.java
--- namedTargetSrc/net/minecraft/unmapped/C_lamqkfie.java	2023-12-23 16:46:59.206564987 +0000
+++ namedSrc/net/minecraft/unmapped/C_lamqkfie.java	2023-12-23 16:45:56.754858212 +0000
@@ -195,7 +195,7 @@
       super.readNbt(nbt);
       this.f_uvbziebv = nbt.getInt("crafting_ticks_remaining");
       this.f_bqaatywv = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      if (!this.m_njtcujiz(nbt)) {
+      if (!this.readLootTableNbt(nbt)) {
          Inventories.readNbt(nbt, this.f_bqaatywv);
       }
 
@@ -221,7 +221,7 @@
    protected void writeNbt(NbtCompound nbt) {
       super.writeNbt(nbt);
       nbt.putInt("crafting_ticks_remaining", this.f_uvbziebv);
-      if (!this.m_ycwokqel(nbt)) {
+      if (!this.writeLootTableNbt(nbt)) {
          Inventories.writeNbt(nbt, this.f_bqaatywv);
       }
 
diff -bur namedTargetSrc/net/minecraft/world/gen/feature/BonusChestFeature.java namedSrc/net/minecraft/world/gen/feature/BonusChestFeature.java
--- namedTargetSrc/net/minecraft/world/gen/feature/BonusChestFeature.java	2023-12-23 16:46:59.058565551 +0000
+++ namedSrc/net/minecraft/world/gen/feature/BonusChestFeature.java	2023-12-23 16:45:56.638858697 +0000
@@ -6,8 +6,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.loot.LootTables;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
@@ -47,7 +47,7 @@
             BlockPos lv5 = lv2.getTopPosition(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, lv4);
             if (lv2.isAir(lv5) || lv2.getBlockState(lv5).getCollisionShape(lv2, lv5).isEmpty()) {
                lv2.setBlockState(lv5, Blocks.CHEST.getDefaultState(), Block.NOTIFY_LISTENERS);
-               C_ehawoasn.m_vhsehsrn(lv2, lv, lv5, LootTables.SPAWN_BONUS_CHEST);
+               LootableInventory.setupLootTable(lv2, lv, lv5, LootTables.SPAWN_BONUS_CHEST);
                BlockState lv6 = Blocks.TORCH.getDefaultState();
 
                for (Direction lv7 : Direction.Type.HORIZONTAL) {
diff -bur namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java
--- namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2023-12-23 16:46:59.226564911 +0000
+++ namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2023-12-23 16:45:56.774858128 +0000
@@ -9,10 +9,10 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.inventory.LootableInventory;
 import net.minecraft.loot.LootTables;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.structure.piece.StructurePiece;
-import net.minecraft.unmapped.C_ehawoasn;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -129,7 +129,7 @@
 
                   if (ad == 1) {
                      this.setBlockStateIf(lv3, lv7, StructurePiece.orientateChest(lv3, lv7, Blocks.CHEST.getDefaultState()), predicate);
-                     C_ehawoasn.m_vhsehsrn(lv3, lv2, lv7, LootTables.SIMPLE_DUNGEON_CHEST);
+                     LootableInventory.setupLootTable(lv3, lv2, lv7, LootTables.SIMPLE_DUNGEON_CHEST);
                      break;
                   }
                }

Please sign in to comment.