diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 6236fe0b26..e661b1095c 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -109,3 +109,5 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 2 serialized METHOD method_43209 playSpawnSound (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_43331 resolveUrl (Ljava/lang/String;)Ljava/net/URL; + ARG 0 url diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index a5660ba370..e3d9293a39 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -33,6 +33,8 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour ARG 0 packDirectory METHOD method_36324 (Lnet/minecraft/class_310;Z)V ARG 1 confirmed + METHOD method_43339 loadServerPack (Lnet/minecraft/class_32$class_5143;)Ljava/util/concurrent/CompletableFuture; + ARG 1 session METHOD method_4633 getPack ()Lnet/minecraft/class_3268; METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/data/DataCache.mapping b/mappings/net/minecraft/data/DataCache.mapping index fd04f63624..a936feede0 100644 --- a/mappings/net/minecraft/data/DataCache.mapping +++ b/mappings/net/minecraft/data/DataCache.mapping @@ -1,6 +1,61 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache FIELD field_11285 root Ljava/nio/file/Path; FIELD field_11287 LOGGER Lorg/slf4j/Logger; + FIELD field_38912 HEADER Ljava/lang/String; + FIELD field_38913 cachePath Ljava/nio/file/Path; + FIELD field_38914 versionName Ljava/lang/String; + FIELD field_38915 cachedDatas Ljava/util/Map; + FIELD field_38916 dataWriters Ljava/util/Map; + FIELD field_38917 paths Ljava/util/Set; + FIELD field_38918 totalSize I METHOD (Ljava/nio/file/Path;Ljava/util/List;Lnet/minecraft/class_6489;)V ARG 1 root + ARG 2 dataProviders + ARG 3 gameVersion METHOD method_10326 write ()V + METHOD method_43347 isVersionDifferent (Lnet/minecraft/class_2405;)Z + ARG 1 dataProvider + METHOD method_43348 parseOrCreateCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; + ARG 0 root + ARG 1 dataProviderPath + METHOD method_43349 (Ljava/util/Set;Lnet/minecraft/class_2408$class_7405;)V + ARG 1 cachedData + METHOD method_43350 (Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/class_2405;Lnet/minecraft/class_2408$class_7404;)V + ARG 2 dataProvider + ARG 3 writer + METHOD method_43351 (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/util/Set;Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/nio/file/Path;)V + ARG 4 path + METHOD method_43352 getOrCreateWriter (Lnet/minecraft/class_2405;)Lnet/minecraft/class_7403; + ARG 1 dataProvider + METHOD method_43353 getPath (Lnet/minecraft/class_2405;)Ljava/nio/file/Path; + ARG 1 dataProvider + METHOD method_43354 (Lnet/minecraft/class_2405;)Lnet/minecraft/class_2408$class_7404; + ARG 1 provider + CLASS class_7404 CachedDataWriter + FIELD field_38919 oldCache Lnet/minecraft/class_2408$class_7405; + FIELD field_38920 newCache Lnet/minecraft/class_2408$class_7405; + FIELD field_38921 cacheMissCount I + METHOD (Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V + ARG 1 versionName + ARG 2 cachedData + METHOD method_43355 isCacheInvalid (Ljava/nio/file/Path;Ljava/lang/String;)Z + ARG 1 path + ARG 2 hash + CLASS class_7405 CachedData + METHOD (Ljava/lang/String;)V + ARG 1 version + METHOD method_43356 size ()I + METHOD method_43357 get (Ljava/nio/file/Path;)Ljava/lang/String; + ARG 1 path + METHOD method_43358 put (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 path + ARG 2 value + METHOD method_43359 parseCache (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2408$class_7405; + ARG 0 root + ARG 1 dataProviderPath + METHOD method_43360 write (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 root + ARG 2 dataProviderPath + ARG 3 description + METHOD method_43361 (Ljava/util/Map;Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 2 line diff --git a/mappings/net/minecraft/data/DataGenerator.mapping b/mappings/net/minecraft/data/DataGenerator.mapping index 8a1ce83535..304e776262 100644 --- a/mappings/net/minecraft/data/DataGenerator.mapping +++ b/mappings/net/minecraft/data/DataGenerator.mapping @@ -3,7 +3,17 @@ CLASS net/minecraft/class_2403 net/minecraft/data/DataGenerator FIELD field_11273 providers Ljava/util/List; FIELD field_11274 output Ljava/nio/file/Path; FIELD field_11275 LOGGER Lorg/slf4j/Logger; + FIELD field_38909 runningProviders Ljava/util/List; + FIELD field_38910 gameVersion Lnet/minecraft/class_6489; + FIELD field_38911 ignoreCache Z + METHOD (Ljava/nio/file/Path;Ljava/util/Collection;Lnet/minecraft/class_6489;Z)V + ARG 1 output + ARG 2 inputs + ARG 3 gameVersion + ARG 4 ignoreCache METHOD method_10312 getInputs ()Ljava/util/Collection; METHOD method_10313 getOutput ()Ljava/nio/file/Path; METHOD method_10314 addProvider (ZLnet/minecraft/class_2405;)V + ARG 1 shouldRun + ARG 2 provider METHOD method_10315 run ()V diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 69812bd970..38a4a2fa0f 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 1 cache METHOD method_10320 writeToPath (Lcom/google/gson/Gson;Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)V ARG 0 gson + ARG 1 writer ARG 2 output ARG 3 path METHOD method_10321 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/DataWriter.mapping b/mappings/net/minecraft/data/DataWriter.mapping new file mode 100644 index 0000000000..f01eaf8a5f --- /dev/null +++ b/mappings/net/minecraft/data/DataWriter.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7403 net/minecraft/data/DataWriter + METHOD method_43345 write (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 path + ARG 2 data + METHOD method_43346 write (Ljava/nio/file/Path;[BLjava/lang/String;)V + ARG 1 path + ARG 2 data + ARG 3 hash diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index 0d442a2635..1cca7fd8e5 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/data/Main METHOD main ([Ljava/lang/String;)V ARG 0 args + METHOD method_4967 (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 0 input METHOD method_4968 create (Ljava/nio/file/Path;Ljava/util/Collection;ZZZZZLnet/minecraft/class_6489;Z)Lnet/minecraft/class_2403; ARG 0 output ARG 1 inputs @@ -9,3 +11,5 @@ CLASS net/minecraft/data/Main ARG 4 includeDev ARG 5 includeReports ARG 6 validate + ARG 7 gameVersion + ARG 8 ignoreCache diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index 9afa34e1ce..d7a62b559d 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -2,9 +2,16 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas FIELD field_15775 EMPTY_IDENTIFIER_NORMALIZE Ljava/util/function/BiFunction; FIELD field_15776 EMPTY Ljava/util/function/BiFunction; FIELD field_15777 FIXER Lcom/mojang/datafixers/DataFixer; + FIELD field_38845 LOGGER Lorg/slf4j/Logger; + METHOD method_15449 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD method_15450 getFixer ()Lcom/mojang/datafixers/DataFixer; METHOD method_15451 build (Lcom/mojang/datafixers/DataFixerBuilder;)V ARG 0 builder + METHOD method_15455 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id + METHOD method_15459 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id METHOD method_15471 create ()Lcom/mojang/datafixers/DataFixer; METHOD method_30068 replacing (Ljava/lang/String;Ljava/lang/String;)Ljava/util/function/UnaryOperator; ARG 0 old diff --git a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping index 9696f1eb1d..b21c91f7df 100644 --- a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/class_7090 net/minecraft/datafixer/fix/BlendingDataFix FIELD field_37414 name Ljava/lang/String; + FIELD field_37415 SKIP_BLENDING_STATUSES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema + METHOD method_41311 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_41312 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_41313 setSections (Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 height + ARG 2 minY diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 81d0d25922..9a870b33d9 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -226,7 +226,15 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_22861 getTeamColorValue ()I METHOD method_22862 resetPosition ()V METHOD method_23311 refreshPosition ()V - METHOD method_23312 getLandingPos ()Lnet/minecraft/class_2338; + METHOD method_23312 getSteppingPos ()Lnet/minecraft/class_2338; + COMMENT {@return the stepping position} + COMMENT + COMMENT @implNote Stepping position is the entity's position, with {@code 1e-05} subtracted + COMMENT from the Y coordinate. This means that, for example, if a player is on a carpet on + COMMENT a soul soil, the carpet's position would be returned. + COMMENT + COMMENT @see #getLandingPos() + COMMENT @see #getSteppingBlockState() METHOD method_23313 getJumpVelocityMultiplier ()F METHOD method_23314 getVelocityAffectingPos ()Lnet/minecraft/class_2338; METHOD method_23315 getDefaultName ()Lnet/minecraft/class_2561; @@ -270,7 +278,14 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 passenger METHOD method_24830 setOnGround (Z)V ARG 1 onGround - METHOD method_25936 getLandingBlockState ()Lnet/minecraft/class_2680; + METHOD method_25936 getSteppingBlockState ()Lnet/minecraft/class_2680; + COMMENT {@return the block state at the stepping position} + COMMENT + COMMENT @implNote Stepping position is the entity's position, with {@code 1e-05} subtracted + COMMENT from the Y coordinate. This means that, for example, if a player is on a carpet on + COMMENT a soul soil, the carpet's position would be returned. + COMMENT + COMMENT @see #getSteppingPos() METHOD method_27298 shouldSpawnSprintingParticles ()Z METHOD method_29239 dismountVehicle ()V COMMENT Dismounts the vehicle if present. @@ -446,9 +461,28 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_43077 playSoundIfNotSilent (Lnet/minecraft/class_3414;)V ARG 1 event METHOD method_43078 getBodyYaw ()F + METHOD method_43258 getPosWithYOffset (F)Lnet/minecraft/class_2338; + ARG 1 offset METHOD method_43259 isInRange (Lnet/minecraft/class_1297;DD)Z ARG 2 horizontalRadius ARG 4 verticalRadius + METHOD method_43260 getLandingPos ()Lnet/minecraft/class_2338; + COMMENT {@return the landing position} + COMMENT + COMMENT @implNote Landing position is the entity's position, with {@code 0.2} subtracted + COMMENT from the Y coordinate. This means that, for example, if a player is on a carpet on + COMMENT a soul soil, the soul soil's position would be returned. + COMMENT + COMMENT @see #getSteppingPos() + COMMENT @see #getLandingBlockState() + METHOD method_43261 getLandingBlockState ()Lnet/minecraft/class_2680; + COMMENT {@return the block state at the landing position} + COMMENT + COMMENT @implNote Landing position is the entity's position, with {@code 0.2} subtracted + COMMENT from the Y coordinate. This means that, for example, if a player is on a carpet on + COMMENT a soul soil, the soul soil's position would be returned. + COMMENT + COMMENT @see #getLandingPos() METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 5584398ebb..06565c1acc 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -61,3 +61,12 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 2 savePropertiesSupplier METHOD method_41901 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143; ARG 1 levelName + METHOD method_43324 showPackLoadFailureScreen ()Ljava/util/concurrent/CompletableFuture; + METHOD method_43326 (Ljava/lang/String;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_437;Ljava/lang/Boolean;)V + ARG 6 proceed + METHOD method_43327 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 1 throwable + METHOD method_43328 (Ljava/lang/Void;)Ljava/lang/Boolean; + ARG 0 void_ + METHOD method_43330 (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; + ARG 1 throwable diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 4516046f7c..25b47b958c 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -151,5 +151,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_29716 stream ()Ljava/util/stream/Stream; METHOD method_33465 randomAxis (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350$class_2351; ARG 1 random + METHOD method_43342 getShuffled (Lnet/minecraft/class_5819;)Ljava/util/List; + ARG 1 random METHOD test (Ljava/lang/Object;)Z ARG 1 direction diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 79f300fcf9..6a45fad1f3 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World FIELD field_35455 tickOrder J FIELD field_36402 dimensionEntry Lnet/minecraft/class_6880; FIELD field_38226 neighborUpdater Lnet/minecraft/class_7165; + FIELD field_38861 blockingRandom Lnet/minecraft/class_5819; FIELD field_9223 border Lnet/minecraft/class_2784; FIELD field_9226 ambientDarkness I FIELD field_9229 random Lnet/minecraft/class_5819;