Deprecate bundled item data #2514
Open
Conversation
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
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
Outdated
Show resolved
Hide resolved
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java
Outdated
Show resolved
Hide resolved
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
Outdated
Show resolved
Hide resolved
| @@ -24,6 +24,7 @@ | |||
| import com.sk89q.worldedit.world.item.ItemType; | |||
| import com.sk89q.worldedit.world.registry.BundledItemRegistry; | |||
|
|
|||
| @SuppressWarnings("deprecation") | |||
There was a problem hiding this comment.
Suggested change
| @SuppressWarnings("deprecation") | |
| @Deprecated |
There was a problem hiding this comment.
This class isn't deprecated
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java
Outdated
Show resolved
Hide resolved
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
Outdated
Show resolved
Hide resolved
| @Nullable | ||
| @SuppressWarnings("removal") |
There was a problem hiding this comment.
Yes, any reference to something deprecated for removal is now erroring the build due to producing a warning, even if the current block is deprecated too
| @@ -23,6 +23,8 @@ | |||
|
|
|||
| import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull; | |||
|
|
|||
| @Deprecated(forRemoval = true) | |||
| @SuppressWarnings("removal") | |||
| @@ -19,5 +19,7 @@ | |||
|
|
|||
| package com.sk89q.worldedit.world.registry; | |||
|
|
|||
| @Deprecated(forRemoval = true) | |||
| @SuppressWarnings("removal") | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR deprecates the concept of bundled item data, as well as the concept of "item material". This was added but never actually used. It's not very mod-compatible, and also requires storing increasingly large numbers of JSON files within the repo and jar files.
Due to the fact that WorldEdit never uses these at all, and that the bundled item registry is loaded when first accessed, this means we can remove the call to actually load it from WorldEdit. If something does happen to be using this deprecated API, it'll trigger it to be loaded upon first access.