Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w44a stuff #3714

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ CLASS net/minecraft/class_8172 net/minecraft/block/entity/DecoratedPotBlockEntit
FIELD field_46661 lastWobbleTime J
FIELD field_46662 lastWobbleType Lnet/minecraft/class_8172$class_8837;
FIELD field_46663 stack Lnet/minecraft/class_1799;
FIELD field_47156 lootTableId Lnet/minecraft/class_2960;
FIELD field_47157 lootTableSeed J
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,15 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
ARG 0 blockEntity
METHOD method_34279 (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_54874 loadAndTryPlaceStructure (Lnet/minecraft/class_3218;)Z
ARG 1 world
METHOD method_54875 loadAndPlaceStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3499;)V
ARG 1 world
ARG 2 template
METHOD method_54877 loadStructure (Lnet/minecraft/class_3499;)V
ARG 1 template
METHOD method_54878 loadAndPlaceStructure (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_54879 getStructureTemplate (Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499;
ARG 1 world
CLASS class_2634 Action
4 changes: 0 additions & 4 deletions mappings/net/minecraft/class_8934.mapping

This file was deleted.

1 change: 1 addition & 0 deletions mappings/net/minecraft/client/option/HotbarStorage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/class_302 net/minecraft/client/option/HotbarStorage
FIELD field_1648 dataFixer Lcom/mojang/datafixers/DataFixer;
FIELD field_32135 STORAGE_ENTRY_COUNT I
METHOD <init> (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V
ARG 1 directory
ARG 2 dataFixer
METHOD method_1409 save ()V
METHOD method_1410 getSavedHotbar (I)Lnet/minecraft/class_748;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ CLASS net/minecraft/class_553 net/minecraft/client/render/entity/model/BatEntity
ARG 1 root
METHOD method_31980 getTexturedModelData ()Lnet/minecraft/class_5607;
METHOD method_54805 setRoostingHeadAngles (F)V
ARG 1 pitch
ARG 1 yaw
25 changes: 25 additions & 0 deletions mappings/net/minecraft/inventory/LootableInventory.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
CLASS net/minecraft/class_8934 net/minecraft/inventory/LootableInventory
FIELD field_47154 LOOT_TABLE_KEY Ljava/lang/String;
FIELD field_47155 LOOT_TABLE_SEED_KEY Ljava/lang/String;
METHOD method_10997 getWorld ()Lnet/minecraft/class_1937;
METHOD method_11016 getPos ()Lnet/minecraft/class_2338;
METHOD method_11285 setLootTable (Lnet/minecraft/class_2960;)V
ARG 1 lootTableId
METHOD method_54866 setLootTableSeed (J)V
ARG 1 lootTableSeed
METHOD method_54867 setLootTable (Lnet/minecraft/class_2960;J)V
ARG 1 lootTableId
ARG 2 lootTableSeed
METHOD method_54868 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
ARG 0 world
ARG 1 random
ARG 2 pos
ARG 3 lootTableId
METHOD method_54869 getLootTable ()Lnet/minecraft/class_2960;
METHOD method_54870 getLootTableSeed ()J
METHOD method_54871 readLootTable (Lnet/minecraft/class_2487;)Z
ARG 1 nbt
METHOD method_54872 writeLootTable (Lnet/minecraft/class_2487;)Z
ARG 1 nbt
METHOD method_54873 generateLoot (Lnet/minecraft/class_1657;)V
ARG 1 player
4 changes: 4 additions & 0 deletions mappings/net/minecraft/village/TradeOffers.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,26 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
ARG 3 count
ARG 4 experience
METHOD <init> (Lnet/minecraft/class_1792;IIII)V
ARG 1 item
ARG 2 price
ARG 3 count
ARG 4 maxUses
ARG 5 experience
METHOD <init> (Lnet/minecraft/class_1792;IIIIF)V
ARG 1 item
ARG 2 price
ARG 3 count
ARG 4 maxUses
ARG 5 experience
ARG 6 multiplier
METHOD <init> (Lnet/minecraft/class_1799;IIII)V
ARG 1 stack
ARG 2 price
ARG 3 count
ARG 4 maxUses
ARG 5 experience
METHOD <init> (Lnet/minecraft/class_1799;IIIIF)V
ARG 1 sell
ARG 2 price
ARG 3 count
ARG 4 maxUses
Expand Down