From 68ee69e8816c2f345138808046c9d96bd96706f2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 2 Nov 2023 03:55:47 +1100 Subject: [PATCH 1/2] 23w44a stuff None of the command stuff here - I tried but scrapped it all, I don't understand that stuff lol --- .../entity/DecoratedPotBlockEntity.mapping | 2 ++ .../entity/StructureBlockBlockEntity.mapping | 11 ++++++++ mappings/net/minecraft/class_8934.mapping | 4 --- .../inventory/LootableInventory.mapping | 25 +++++++++++++++++++ 4 files changed, 38 insertions(+), 4 deletions(-) delete mode 100644 mappings/net/minecraft/class_8934.mapping create mode 100644 mappings/net/minecraft/inventory/LootableInventory.mapping diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping index f5accad9f2..65281a9288 100644 --- a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -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 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 98d2c819bf..f9fb159944 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/class_8934.mapping b/mappings/net/minecraft/class_8934.mapping deleted file mode 100644 index ead717a11c..0000000000 --- a/mappings/net/minecraft/class_8934.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_8934 - 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 diff --git a/mappings/net/minecraft/inventory/LootableInventory.mapping b/mappings/net/minecraft/inventory/LootableInventory.mapping new file mode 100644 index 0000000000..8230989b0a --- /dev/null +++ b/mappings/net/minecraft/inventory/LootableInventory.mapping @@ -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 From 944a71c87f3de8b13f01691ac22b5ed5243edf38 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 2 Nov 2023 04:38:56 +1100 Subject: [PATCH 2/2] fixes --- mappings/net/minecraft/client/option/HotbarStorage.mapping | 1 + .../client/render/entity/model/BatEntityModel.mapping | 2 +- mappings/net/minecraft/village/TradeOffers.mapping | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/option/HotbarStorage.mapping b/mappings/net/minecraft/client/option/HotbarStorage.mapping index 06320e9c89..52e85f71fa 100644 --- a/mappings/net/minecraft/client/option/HotbarStorage.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorage.mapping @@ -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 (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; diff --git a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping index a84b9456d9..2b9f51c4eb 100644 --- a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping @@ -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 diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 7727ebf27b..56863c78c5 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -179,22 +179,26 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (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 (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIIIF)V + ARG 1 sell ARG 2 price ARG 3 count ARG 4 maxUses