Skip to content

Commit

Permalink
Improve advancement mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
@apple502j
apple502j committed Aug 31, 2023
1 parent 45b727b commit e3cec29
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 12 deletions.
6 changes: 3 additions & 3 deletions ...advancement/IdentifiedAdvancement.mapping → ...raft/advancement/AdvancementEntry.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CLASS net/minecraft/class_8779 net/minecraft/advancement/IdentifiedAdvancement
CLASS net/minecraft/class_8779 net/minecraft/advancement/AdvancementEntry
FIELD comp_1919 id Lnet/minecraft/class_2960;
FIELD comp_1920 advancement Lnet/minecraft/class_161;
FIELD comp_1920 value Lnet/minecraft/class_161;
METHOD comp_1919 id ()Lnet/minecraft/class_2960;
METHOD comp_1920 advancement ()Lnet/minecraft/class_161;
METHOD comp_1920 value ()Lnet/minecraft/class_161;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_53635 write (Lnet/minecraft/class_2540;)V
Expand Down
20 changes: 20 additions & 0 deletions mappings/net/minecraft/advancement/AdvancementProgress.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,33 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress
FIELD field_46080 CODEC Lcom/mojang/serialization/Codec;
FIELD field_46081 TIME_FORMATTER Ljava/time/format/DateTimeFormatter;
FIELD field_46082 TIME_CODEC Lcom/mojang/serialization/Codec;
FIELD field_46083 MAP_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Ljava/util/Map;)V
ARG 1 criteriaProgresses
METHOD compareTo (Ljava/lang/Object;)I
ARG 1 other
METHOD method_33895 (Lnet/minecraft/class_2540;Lnet/minecraft/class_178;)V
ARG 0 bufx
ARG 1 progresses
METHOD method_53654 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_53655 (Ljava/time/Instant;)Ljava/time/temporal/TemporalAccessor;
ARG 0 instant
METHOD method_53656 (Ljava/util/Map$Entry;)Ljava/time/Instant;
ARG 0 entry
METHOD method_53657 (Ljava/util/Map;)Ljava/util/Map;
ARG 0 map
METHOD method_53658 (Ljava/util/Map;Ljava/lang/Boolean;)Lnet/minecraft/class_167;
ARG 0 criteriaProgresses
ARG 1 done
METHOD method_53659 (Lnet/minecraft/class_167;)Ljava/util/Map;
ARG 0 advancementProgress
METHOD method_53660 (Ljava/util/Map$Entry;)Z
ARG 0 entry
METHOD method_53661 (Ljava/util/Map;)Ljava/util/Map;
ARG 0 map
METHOD method_53662 (Ljava/util/Map$Entry;)Lnet/minecraft/class_178;
ARG 0 entry
METHOD method_53663 isCriterionObtained (Ljava/lang/String;)Z
ARG 1 name
METHOD method_727 init (Lnet/minecraft/class_8782;)V
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/advancement/AdvancementRequirements.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ CLASS net/minecraft/class_8782 net/minecraft/advancement/AdvancementRequirements
METHOD method_53664 getLength ()I
METHOD method_53666 fromJson (Lcom/google/gson/JsonArray;Ljava/util/Set;)Lnet/minecraft/class_8782;
ARG 0 json
ARG 1 criteria
METHOD method_53668 allOf (Ljava/util/Collection;)Lnet/minecraft/class_8782;
ARG 0 requirements
METHOD method_53669 matches (Ljava/util/function/Predicate;)Z
Expand All @@ -15,6 +16,8 @@ CLASS net/minecraft/class_8782 net/minecraft/advancement/AdvancementRequirements
ARG 0 requirements
ARG 1 predicate
METHOD method_53672 toJson ()Lcom/google/gson/JsonArray;
METHOD method_53673 (I)[[Ljava/lang/String;
ARG 0 size
METHOD method_53674 anyOf (Ljava/util/Collection;)Lnet/minecraft/class_8782;
ARG 0 requirements
METHOD method_53675 countMatches (Ljava/util/function/Predicate;)I
Expand Down
24 changes: 24 additions & 0 deletions mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke
FIELD field_41735 progress Ljava/util/Map;
FIELD field_41736 updatedRoots Ljava/util/Set;
FIELD field_46073 advancementManager Lnet/minecraft/class_163;
FIELD field_46074 progressMapCodec Lcom/mojang/serialization/Codec;
METHOD <init> (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3324;Lnet/minecraft/class_2989;Ljava/nio/file/Path;Lnet/minecraft/class_3222;)V
ARG 1 dataFixer
ARG 2 playerManager
Expand Down Expand Up @@ -59,6 +60,29 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke
ARG 1 advancement
METHOD method_48029 (Lnet/minecraft/class_8781;)Z
ARG 1 advancement
METHOD method_53637 (Lnet/minecraft/class_8779;Lnet/minecraft/class_185;)V
ARG 2 display
METHOD method_53638 beginTracking (Lnet/minecraft/class_8779;Ljava/lang/String;Lnet/minecraft/class_175;)V
ARG 1 advancement
ARG 2 id
ARG 3 criterion
METHOD method_53639 (Lnet/minecraft/class_2989;Lnet/minecraft/class_2960;Lnet/minecraft/class_167;)V
ARG 2 id
ARG 3 progress
METHOD method_53640 loadProgressMap (Lnet/minecraft/class_2989;Lnet/minecraft/class_2985$class_8780;)V
ARG 1 loader
ARG 2 progressMap
METHOD method_53641 (Ljava/util/Map;Lnet/minecraft/class_8779;Lnet/minecraft/class_167;)V
ARG 1 entry
ARG 2 progress
METHOD method_53642 endTrackingCompleted (Lnet/minecraft/class_8779;Ljava/lang/String;Lnet/minecraft/class_175;)V
ARG 1 advancement
ARG 2 id
ARG 3 criterion
METHOD method_53643 createProgressMap ()Lnet/minecraft/class_2985$class_8780;
CLASS class_8780 ProgressMap
FIELD field_46075 CODEC Lcom/mojang/serialization/Codec;
METHOD method_53644 forEach (Ljava/util/function/BiConsumer;)V
ARG 1 consumer
METHOD method_53645 (Ljava/util/function/BiConsumer;Ljava/util/Map$Entry;)V
ARG 1 entry
7 changes: 0 additions & 7 deletions mappings/net/minecraft/recipe/IdentifiedRecipe.mapping
View file

This file was deleted.

7 changes: 7 additions & 0 deletions mappings/net/minecraft/recipe/RecipeEntry.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS net/minecraft/class_8786 net/minecraft/recipe/RecipeEntry
FIELD comp_1932 id Lnet/minecraft/class_2960;
FIELD comp_1933 value Lnet/minecraft/class_1860;
METHOD comp_1932 id ()Lnet/minecraft/class_2960;
METHOD comp_1933 value ()Lnet/minecraft/class_1860;
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
4 changes: 2 additions & 2 deletions mappings/net/minecraft/server/ServerAdvancementLoader.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader
FIELD field_13404 advancementIdentityMap Ljava/util/Map;
FIELD field_13404 advancements Ljava/util/Map;
FIELD field_13405 GSON Lcom/google/gson/Gson;
FIELD field_13406 LOGGER Lorg/slf4j/Logger;
FIELD field_44468 conditionManager Lnet/minecraft/class_60;
FIELD field_46076 advancementManager Lnet/minecraft/class_163;
FIELD field_46076 manager Lnet/minecraft/class_163;
METHOD <init> (Lnet/minecraft/class_60;)V
ARG 1 conditionManager
METHOD method_12893 getAdvancements ()Ljava/util/Collection;
Expand Down

0 comments on commit e3cec29

Please sign in to comment.