mirror of https://github.com/FabricMC/yarn.git
Fix conflict
This commit is contained in:
parent
184f7a6562
commit
4aaa039a00
|
@ -1,11 +1,9 @@
|
|||
CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
|
||||
FIELD comp_2520 codec Lcom/mojang/serialization/Codec;
|
||||
FIELD comp_2521 id Ljava/lang/String;
|
||||
FIELD comp_2522 validator Lnet/minecraft/class_8490$class_8491;
|
||||
FIELD field_44499 LOGGER Lorg/slf4j/Logger;
|
||||
METHOD comp_2520 codec ()Lcom/mojang/serialization/Codec;
|
||||
METHOD comp_2521 id ()Ljava/lang/String;
|
||||
METHOD comp_2522 validator ()Lnet/minecraft/class_8490$class_8491;
|
||||
METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional;
|
||||
ARG 1 id
|
||||
ARG 2 ops
|
||||
|
@ -20,7 +18,6 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
|
|||
ARG 1 reporter
|
||||
ARG 3 value
|
||||
METHOD method_51215 stream ()Ljava/util/stream/Stream;
|
||||
METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491;
|
||||
METHOD method_51217 tableValidator ()Lnet/minecraft/class_8490$class_8491;
|
||||
METHOD method_53267 (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DataResult$PartialResult;)V
|
||||
ARG 2 result
|
||||
|
|
Loading…
Reference in New Issue