diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index 79a307a63c..3a7dde8b86 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -11,7 +11,9 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke FIELD field_13395 GSON Lcom/google/gson/Gson; FIELD field_13396 dirty Z METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V + ARG 1 advancementLoader METHOD method_12873 load (Lnet/minecraft/class_2989;)V + ARG 1 advancementLoader METHOD method_12874 beginTracking (Lnet/minecraft/class_161;)V ARG 1 advancement METHOD method_12875 setOwner (Lnet/minecraft/class_3222;)V @@ -39,8 +41,10 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke METHOD method_12885 updateDisplay (Lnet/minecraft/class_161;)V ARG 1 advancement METHOD method_12886 reload (Lnet/minecraft/class_2989;)V + ARG 1 advancementLoader METHOD method_12887 updateCompleted ()V METHOD method_12888 setDisplayTab (Lnet/minecraft/class_161;)V ARG 1 advancement METHOD method_12889 beginTrackingAllAdvancements (Lnet/minecraft/class_2989;)V + ARG 1 advancementLoader METHOD method_12890 save ()V diff --git a/mappings/net/minecraft/class_5341.mapping b/mappings/net/minecraft/loot/condition/LootCondition.mapping similarity index 73% rename from mappings/net/minecraft/class_5341.mapping rename to mappings/net/minecraft/loot/condition/LootCondition.mapping index 34f700cbf5..e395277e99 100644 --- a/mappings/net/minecraft/class_5341.mapping +++ b/mappings/net/minecraft/loot/condition/LootCondition.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5341 +CLASS net/minecraft/class_5341 net/minecraft/loot/condition/LootCondition CLASS class_210 Builder METHOD method_16780 invert ()Lnet/minecraft/class_5341$class_210; METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; diff --git a/mappings/net/minecraft/loot/condition/LootConditionType.mapping b/mappings/net/minecraft/loot/condition/LootConditionType.mapping new file mode 100644 index 0000000000..3bf4c80389 --- /dev/null +++ b/mappings/net/minecraft/loot/condition/LootConditionType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5342 net/minecraft/loot/condition/LootConditionType diff --git a/mappings/net/minecraft/loot/condition/LootConditions.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping similarity index 81% rename from mappings/net/minecraft/loot/condition/LootConditions.mapping rename to mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index b3cd03733e..a24aea5eb7 100644 --- a/mappings/net/minecraft/loot/condition/LootConditions.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -1,4 +1,6 @@ -CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditions +CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes + METHOD method_29327 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5342; + ARG 0 id METHOD method_921 (Ljava/lang/Object;)Z ARG 0 predicates METHOD method_924 joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/loot/entry/LootEntries.mapping b/mappings/net/minecraft/loot/entry/LootEntries.mapping deleted file mode 100644 index b087673a1f..0000000000 --- a/mappings/net/minecraft/loot/entry/LootEntries.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootEntries diff --git a/mappings/net/minecraft/loot/entry/LootEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping similarity index 92% rename from mappings/net/minecraft/loot/entry/LootEntry.mapping rename to mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index 74517565f0..c51aadc58c 100644 --- a/mappings/net/minecraft/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootEntry +CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry FIELD field_988 conditions [Lnet/minecraft/class_5341; FIELD field_989 conditionPredicate Ljava/util/function/Predicate; METHOD ([Lnet/minecraft/class_5341;)V diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryType.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryType.mapping new file mode 100644 index 0000000000..88c0e7035b --- /dev/null +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5338 net/minecraft/loot/entry/LootPoolEntryType diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping new file mode 100644 index 0000000000..41739f5a3e --- /dev/null +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootPoolEntryTypes + METHOD method_29317 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5338; + ARG 0 id diff --git a/mappings/net/minecraft/loot/function/LootFunctionType.mapping b/mappings/net/minecraft/loot/function/LootFunctionType.mapping new file mode 100644 index 0000000000..eb6bce24a3 --- /dev/null +++ b/mappings/net/minecraft/loot/function/LootFunctionType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5339 net/minecraft/loot/function/LootFunctionType diff --git a/mappings/net/minecraft/loot/function/LootFunctions.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping similarity index 84% rename from mappings/net/minecraft/loot/function/LootFunctions.mapping rename to mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index 9cda46beb4..36edad84de 100644 --- a/mappings/net/minecraft/loot/function/LootFunctions.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -1,5 +1,7 @@ -CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctions +CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes FIELD field_1102 NOOP Ljava/util/function/BiFunction; + METHOD method_29323 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5339; + ARG 0 id METHOD method_591 (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 2 stack ARG 3 context diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 5d800e5e3b..4780d793d6 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -96,6 +96,12 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25116 BLOCK_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25117 FOLIAGE_PLACER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25118 TRUNK_PLACER_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_25293 LOOT_POOL_ENTRY_TYPE Lnet/minecraft/class_2378; + FIELD field_25294 LOOT_FUNCTION_TYPE Lnet/minecraft/class_2378; + FIELD field_25295 LOOT_POOL_ENTRY_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_25296 LOOT_FUNCTION_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_25297 LOOT_CONDITION_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_25299 LOOT_CONDITION_TYPE Lnet/minecraft/class_2378; METHOD method_10220 stream ()Ljava/util/stream/Stream; METHOD method_10221 getId (Ljava/lang/Object;)Lnet/minecraft/class_2960; ARG 1 entry