Skip to content

Remove deprecated getName method from Item/Block APIs #2987

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.

Sign up for GitHub

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

Draft
me4502 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Remove deprecated getName method from Item/Block APIs #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9339a4
Remove deprecated BiomeData API
me4502 Jul 6, 2026
9db1c20
Remove deprecated getName method from Item/Block APIs
me4502 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions verification/src/changes/accepted-core-public-api-changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,79 @@
"CONSTRUCTOR_REMOVED"
]
}
],
"Removal of deprecated API for WorldEdit 8": [
{
"type": "com.sk89q.worldedit.world.biome.BiomeData",
"member": "Class com.sk89q.worldedit.world.biome.BiomeData",
"changes": [
"CLASS_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.biome.BiomeData",
"member": "Method com.sk89q.worldedit.world.biome.BiomeData.getName()",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.biome.Biomes",
"member": "Class com.sk89q.worldedit.world.biome.Biomes",
"changes": [
"CLASS_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.biome.Biomes",
"member": "Method com.sk89q.worldedit.world.biome.Biomes.findBiomeByName(java.util.Collection,java.lang.String,com.sk89q.worldedit.world.registry.BiomeRegistry)",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.registry.BiomeRegistry",
"member": "Method com.sk89q.worldedit.world.registry.BiomeRegistry.getData(com.sk89q.worldedit.world.biome.BiomeType)",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.block.BlockType",
"member": "Method com.sk89q.worldedit.world.block.BlockType.getName()",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.item.ItemType",
"member": "Method com.sk89q.worldedit.world.item.ItemType.getName()",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.registry.BlockRegistry",
"member": "Method com.sk89q.worldedit.world.registry.BlockRegistry.getName(com.sk89q.worldedit.world.block.BlockType)",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.world.registry.ItemRegistry",
"member": "Method com.sk89q.worldedit.world.registry.ItemRegistry.getName(com.sk89q.worldedit.world.item.ItemType)",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
}
]
}
14 changes: 0 additions & 14 deletions worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.util.translation.TranslationManager;
import com.sk89q.worldedit.world.biome.BiomeData;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.registry.BiomeRegistry;
import org.bukkit.block.Biome;

import javax.annotation.Nullable;

/**
* A biome registry for Bukkit.
Expand All @@ -43,14 +39,4 @@ public Component getRichName(BiomeType biomeType) {
TranslationManager.makeTranslationKey("biome", biomeType.id())
);
}

@SuppressWarnings({ "removal" })
@Deprecated
@Nullable
@Override
public BiomeData getData(BiomeType biome) {
final Biome bukkitBiome = BukkitAdapter.adapt(biome);
return bukkitBiome == null ? null : bukkitBiome::name;
}

}
28 changes: 0 additions & 28 deletions worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcBiomeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.biome.BiomeData;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.registry.BiomeRegistry;
import net.minecraft.resources.Identifier;
Expand All @@ -36,31 +35,4 @@ public final class CoreMcBiomeRegistry implements BiomeRegistry {
public Component getRichName(BiomeType biomeType) {
return TranslatableComponent.of(Util.makeDescriptionId("biome", Identifier.parse(biomeType.id())));
}

@Deprecated
@Override
public BiomeData getData(BiomeType biome) {
return new CoreMcBiomeData(biome);
}

@Deprecated
private static final class CoreMcBiomeData implements BiomeData {
private final BiomeType biome;

/**
* Create a new instance.
*
* @param biome the base biome
*/
private CoreMcBiomeData(BiomeType biome) {
this.biome = biome;
}

@SuppressWarnings("deprecation")
@Override
public String getName() {
return biome.id();
}
}

}
43 changes: 0 additions & 43 deletions worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeData.java
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeName.java
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/Biomes.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ public class BlockType implements Keyed {
= LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getMaterial(this));
@SuppressWarnings("this-escape")
@Deprecated
private final LazyReference<String> name = LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getName(this));
@SuppressWarnings("this-escape")
private final LazyReference<Integer> legacyId = LazyReference.from(() -> computeLegacy(0));
@SuppressWarnings("this-escape")
private final LazyReference<Integer> legacyData = LazyReference.from(() -> computeLegacy(1));
Expand Down Expand Up @@ -123,21 +119,6 @@ public Component getRichName() {
.getRegistries().getBlockRegistry().getRichName(this);
}

/**
* Gets the name of this block, or the ID if the name cannot be found.
*
* @return The name, or ID
* @deprecated The name is now translatable, use {@link #getRichName()}.
*/
@Deprecated
public String getName() {
String name = this.name.getValue();
if (name == null || name.isEmpty()) {
return id();
}
return name;
}

/**
* Gets the properties of this BlockType in a {@code key->property} mapping.
*
Expand Down
Loading
Loading