-
Notifications
You must be signed in to change notification settings - Fork 390
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
25w04a stuff I missed #4099
Merged
Merged
25w04a stuff I missed #4099
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
mappings/net/minecraft/client/render/item/model/WorldDependentModelData.mapping
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
.../model/ConditionItemModelProperty.mapping → ...nder/item/property/PropertyTester.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...t/minecraft/client/render/Atlases.mapping → ...raft/client/texture/atlas/Atlases.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
mappings/net/minecraft/client/texture/atlas/DirectoryAtlasSource.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
mappings/net/minecraft/client/texture/atlas/SingleAtlasSource.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
CLASS net/minecraft/class_7955 net/minecraft/client/texture/atlas/SingleAtlasSource | ||
FIELD comp_3619 resource Lnet/minecraft/class_2960; | ||
FIELD comp_3620 sprite Ljava/util/Optional; | ||
FIELD field_41402 CODEC Lcom/mojang/serialization/MapCodec; | ||
FIELD field_41403 LOGGER Lorg/slf4j/Logger; | ||
METHOD <init> (Lnet/minecraft/class_2960;)V | ||
ARG 1 resourceId | ||
METHOD <init> (Lnet/minecraft/class_2960;Ljava/util/Optional;)V | ||
ARG 1 resource | ||
ARG 2 sprite | ||
METHOD comp_3619 resource ()Lnet/minecraft/class_2960; | ||
METHOD comp_3620 sprite ()Ljava/util/Optional; | ||
METHOD method_47687 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; | ||
ARG 0 instance |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
CLASS net/minecraft/class_10719 net/minecraft/client/world/DataCache | ||
FIELD field_56351 dataFunction Ljava/util/function/Function; | ||
FIELD field_56352 context Lnet/minecraft/class_10719$class_10720; | ||
FIELD field_56353 data Ljava/lang/Object; | ||
METHOD <init> (Ljava/util/function/Function;)V | ||
ARG 1 dataFunction | ||
METHOD method_67266 clean ()V | ||
METHOD method_67267 compute (Lnet/minecraft/class_10719$class_10720;)Ljava/lang/Object; | ||
ARG 1 context | ||
CLASS class_10720 CacheContext | ||
METHOD registerForCleaning (Lnet/minecraft/class_10719;)V | ||
ARG 1 dataCache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
mappings/net/minecraft/command/argument/packrat/NbtParsingRule.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,4 @@ | ||
CLASS net/minecraft/class_9416 net/minecraft/command/argument/packrat/NbtParsingRule | ||
FIELD field_56253 ops Lcom/mojang/serialization/DynamicOps; | ||
METHOD <init> (Lcom/mojang/serialization/DynamicOps;)V | ||
ARG 1 ops |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
mappings/net/minecraft/entity/projectile/thrown/LingeringPotionEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
mappings/net/minecraft/entity/projectile/thrown/SplashPotionEntity.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,11 @@ | ||
CLASS net/minecraft/class_10691 net/minecraft/entity/projectile/thrown/SplashPotionEntity | ||
METHOD <init> (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V | ||
ARG 1 world | ||
ARG 2 x | ||
ARG 4 y | ||
ARG 6 z | ||
ARG 8 stack | ||
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)V | ||
ARG 1 world | ||
ARG 2 owner | ||
ARG 3 stack |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was hesitating on whether or not to call this one a cache, but considering that it can regenerate the stored data at any time, this is probably the right choice.
However, I think this name is way too generic for the two specific usages it has. I like the change from "world" to "context" (since the type parameter implies there could be other kinds of contexts in the future, even though it's only used with
ClientWorld
right now), so maybeContextDependentDataCache
?