Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-25 18:40:05 +01:00
chore: address deprecations from new records (#2768)
* Category should implement Keyed
Dieser Commit ist enthalten in:
Ursprung
62297f9479
Commit
9843bb0188
@ -283,11 +283,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
|
||||
private static Block getBlockFromType(BlockType blockType) {
|
||||
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
|
||||
}
|
||||
|
||||
private static Item getItemFromType(ItemType itemType) {
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -440,7 +440,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||
ServerLevel worldServer = craftWorld.getHandle();
|
||||
|
||||
Entity createdEntity = createEntityFromId(state.getType().getId(), craftWorld.getHandle());
|
||||
Entity createdEntity = createEntityFromId(state.getType().id(), craftWorld.getHandle());
|
||||
|
||||
if (createdEntity != null) {
|
||||
CompoundBinaryTag nativeTag = state.getNbt();
|
||||
@ -547,7 +547,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
@Override
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
|
||||
item.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbtData())));
|
||||
|
@ -480,7 +480,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM)
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().id())),
|
||||
baseItemStack.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData())));
|
||||
@ -547,7 +547,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
.getServer()
|
||||
.registryAccess()
|
||||
.registryOrThrow(BIOME);
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.id());
|
||||
Biome biome = registry.get(resourceLocation);
|
||||
return registry.getId(biome);
|
||||
}
|
||||
|
@ -284,11 +284,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
|
||||
private static Block getBlockFromType(BlockType blockType) {
|
||||
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
|
||||
}
|
||||
|
||||
private static Item getItemFromType(ItemType itemType) {
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -480,7 +480,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||
ServerLevel worldServer = craftWorld.getHandle();
|
||||
|
||||
Entity createdEntity = createEntityFromId(state.getType().getId(), craftWorld.getHandle());
|
||||
Entity createdEntity = createEntityFromId(state.getType().id(), craftWorld.getHandle());
|
||||
|
||||
if (createdEntity != null) {
|
||||
CompoundBinaryTag nativeTag = state.getNbt();
|
||||
@ -598,7 +598,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
@Override
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
|
||||
item.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbtData())));
|
||||
|
@ -480,7 +480,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM)
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().id())),
|
||||
baseItemStack.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData())));
|
||||
@ -547,7 +547,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
.getServer()
|
||||
.registryAccess()
|
||||
.registryOrThrow(BIOME);
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.id());
|
||||
Biome biome = registry.get(resourceLocation);
|
||||
return registry.getId(biome);
|
||||
}
|
||||
|
@ -281,11 +281,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
|
||||
private static Block getBlockFromType(BlockType blockType) {
|
||||
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
|
||||
}
|
||||
|
||||
private static Item getItemFromType(ItemType itemType) {
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -440,7 +440,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||
ServerLevel worldServer = craftWorld.getHandle();
|
||||
|
||||
Entity createdEntity = createEntityFromId(state.getType().getId(), craftWorld.getHandle());
|
||||
Entity createdEntity = createEntityFromId(state.getType().id(), craftWorld.getHandle());
|
||||
|
||||
if (createdEntity != null) {
|
||||
CompoundBinaryTag nativeTag = state.getNbt();
|
||||
@ -547,7 +547,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
@Override
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
|
||||
item.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbtData())));
|
||||
|
@ -483,7 +483,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM)
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().id())),
|
||||
baseItemStack.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData())));
|
||||
@ -550,7 +550,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
.getServer()
|
||||
.registryAccess()
|
||||
.registryOrThrow(BIOME);
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.id());
|
||||
Biome biome = registry.get(resourceLocation);
|
||||
return registry.getId(biome);
|
||||
}
|
||||
|
@ -281,11 +281,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
|
||||
private static Block getBlockFromType(BlockType blockType) {
|
||||
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(blockType.id()));
|
||||
}
|
||||
|
||||
private static Item getItemFromType(ItemType itemType) {
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.getId()));
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(itemType.id()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -440,7 +440,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||
ServerLevel worldServer = craftWorld.getHandle();
|
||||
|
||||
Entity createdEntity = createEntityFromId(state.getType().getId(), craftWorld.getHandle());
|
||||
Entity createdEntity = createEntityFromId(state.getType().id(), craftWorld.getHandle());
|
||||
|
||||
if (createdEntity != null) {
|
||||
CompoundBinaryTag nativeTag = state.getNbt();
|
||||
@ -547,7 +547,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
@Override
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
|
||||
item.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(item.getNbtData())));
|
||||
|
@ -483,7 +483,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||
ItemStack stack = new ItemStack(
|
||||
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM)
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||
.get(ResourceLocation.tryParse(baseItemStack.getType().id())),
|
||||
baseItemStack.getAmount()
|
||||
);
|
||||
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData())));
|
||||
@ -550,7 +550,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
.getServer()
|
||||
.registryAccess()
|
||||
.registryOrThrow(BIOME);
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.id());
|
||||
Biome biome = registry.get(resourceLocation);
|
||||
return registry.getId(biome);
|
||||
}
|
||||
|
@ -291,12 +291,12 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
private static Block getBlockFromType(BlockType blockType) {
|
||||
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK).get(ResourceLocation.tryParse(
|
||||
blockType.getId()));
|
||||
blockType.id()));
|
||||
}
|
||||
|
||||
private static Item getItemFromType(ItemType itemType) {
|
||||
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(
|
||||
itemType.getId()));
|
||||
itemType.id()));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -470,7 +470,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||
ServerLevel worldServer = craftWorld.getHandle();
|
||||
|
||||
Entity createdEntity = createEntityFromId(state.getType().getId(), craftWorld.getHandle());
|
||||
Entity createdEntity = createEntityFromId(state.getType().id(), craftWorld.getHandle());
|
||||
|
||||
if (createdEntity != null) {
|
||||
CompoundBinaryTag nativeTag = state.getNbt();
|
||||
@ -598,7 +598,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
|
||||
final RegistryAccess.Frozen registryAccess = DedicatedServer.getServer().registryAccess();
|
||||
ItemStack stack = new ItemStack(
|
||||
registryAccess.registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().getId())),
|
||||
registryAccess.registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(item.getType().id())),
|
||||
item.getAmount()
|
||||
);
|
||||
final CompoundTag nbt = (net.minecraft.nbt.CompoundTag) fromNative(item.getNbtData());
|
||||
|
@ -492,7 +492,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||
final RegistryAccess.Frozen registryAccess = DedicatedServer.getServer().registryAccess();
|
||||
ItemStack stack = new ItemStack(
|
||||
registryAccess.registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||
registryAccess.registryOrThrow(Registries.ITEM).get(ResourceLocation.tryParse(baseItemStack.getType().id())),
|
||||
baseItemStack.getAmount()
|
||||
);
|
||||
final CompoundTag nbt = (net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData());
|
||||
@ -572,7 +572,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
|
||||
.getServer()
|
||||
.registryAccess()
|
||||
.registryOrThrow(BIOME);
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.id());
|
||||
Biome biome = registry.get(resourceLocation);
|
||||
return registry.getId(biome);
|
||||
}
|
||||
|
@ -166,10 +166,10 @@ public interface IBukkitAdapter {
|
||||
*/
|
||||
default Material adapt(ItemType itemType) {
|
||||
checkNotNull(itemType);
|
||||
if (!itemType.getId().startsWith("minecraft:")) {
|
||||
if (!itemType.id().startsWith("minecraft:")) {
|
||||
throw new IllegalArgumentException("Bukkit only supports Minecraft items");
|
||||
}
|
||||
return Material.getMaterial(itemType.getId().substring(10).toUpperCase(Locale.ROOT));
|
||||
return Material.getMaterial(itemType.id().substring(10).toUpperCase(Locale.ROOT));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -180,10 +180,10 @@ public interface IBukkitAdapter {
|
||||
*/
|
||||
default Material adapt(BlockType blockType) {
|
||||
checkNotNull(blockType);
|
||||
if (!blockType.getId().startsWith("minecraft:")) {
|
||||
if (!blockType.id().startsWith("minecraft:")) {
|
||||
throw new IllegalArgumentException("Bukkit only supports Minecraft blocks");
|
||||
}
|
||||
String id = blockType.getId().substring(10).toUpperCase(Locale.ROOT);
|
||||
String id = blockType.id().substring(10).toUpperCase(Locale.ROOT);
|
||||
return Material.getMaterial(id);
|
||||
}
|
||||
|
||||
@ -293,11 +293,11 @@ public interface IBukkitAdapter {
|
||||
}
|
||||
|
||||
default Biome adapt(BiomeType biomeType) {
|
||||
if (!biomeType.getId().startsWith("minecraft:")) {
|
||||
if (!biomeType.id().startsWith("minecraft:")) {
|
||||
throw new IllegalArgumentException("Bukkit only supports vanilla biomes");
|
||||
}
|
||||
try {
|
||||
return Biome.valueOf(biomeType.getId().substring(10).toUpperCase(Locale.ROOT));
|
||||
return Biome.valueOf(biomeType.id().substring(10).toUpperCase(Locale.ROOT));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return null;
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ class BukkitBiomeRegistry implements BiomeRegistry {
|
||||
@Override
|
||||
public Component getRichName(BiomeType biomeType) {
|
||||
return TranslatableComponent.of(
|
||||
TranslationManager.makeTranslationKey("biome", biomeType.getId())
|
||||
TranslationManager.makeTranslationKey("biome", biomeType.id())
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -162,7 +162,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
|
||||
final PlayerInventory inv = player.getInventory();
|
||||
ItemStack newItem = BukkitAdapter.adapt(itemStack);
|
||||
TaskManager.taskManager().sync(() -> {
|
||||
if (itemStack.getType().getId().equalsIgnoreCase(WorldEdit.getInstance().getConfiguration().wandItem)) {
|
||||
if (itemStack.getType().id().equalsIgnoreCase(WorldEdit.getInstance().getConfiguration().wandItem)) {
|
||||
inv.remove(newItem);
|
||||
}
|
||||
final ItemStack item = player.getInventory().getItemInMainHand();
|
||||
@ -267,7 +267,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
|
||||
|
||||
@Override
|
||||
public void setGameMode(GameMode gameMode) {
|
||||
player.setGameMode(org.bukkit.GameMode.valueOf(gameMode.getId().toUpperCase(Locale.ROOT)));
|
||||
player.setGameMode(org.bukkit.GameMode.valueOf(gameMode.id().toUpperCase(Locale.ROOT)));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -230,7 +230,7 @@ public class BukkitServerInterface extends AbstractPlatform implements MultiUser
|
||||
|
||||
//FAWE start
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return "intellectualsites:bukkit";
|
||||
}
|
||||
//FAWE end
|
||||
|
@ -224,7 +224,7 @@ public class BukkitWorld extends AbstractWorld {
|
||||
//FAWE end
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return getWorld().getName().replace(" ", "_").toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
|
@ -68,7 +68,7 @@ public class CLIBlockRegistry extends BundledBlockRegistry {
|
||||
@Override
|
||||
public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
|
||||
Map<String, FileRegistries.BlockProperty> properties =
|
||||
CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.getId()).properties;
|
||||
CLIWorldEdit.inst.getFileRegistries().getDataFile().blocks.get(blockType.id()).properties;
|
||||
Maps.EntryTransformer<String, FileRegistries.BlockProperty, Property<?>> entryTransform =
|
||||
(key, value) -> createProperty(value.type, key, value.values);
|
||||
return ImmutableMap.copyOf(Maps.transformEntries(properties, entryTransform));
|
||||
|
@ -115,7 +115,7 @@ class CLIPlatform extends AbstractPlatform {
|
||||
@Override
|
||||
public World matchWorld(World world) {
|
||||
return this.worlds.stream()
|
||||
.filter(w -> w.getId().equals(world.getId()))
|
||||
.filter(w -> w.id().equals(world.id()))
|
||||
.findAny()
|
||||
.orElse(null);
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ public class ClipboardWorld extends AbstractWorld implements Clipboard, CLIWorld
|
||||
//FAWE end
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return getName().replace(" ", "_").toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IB
|
||||
@SuppressWarnings("unchecked")
|
||||
private <B extends BlockStateHolder<B>> B checkBlock(B block) {
|
||||
if (blockedBlocks != null) {
|
||||
if (blockedBlocks.contains(block.getBlockType().getId())) {
|
||||
if (blockedBlocks.contains(block.getBlockType().id())) {
|
||||
return (B) (block instanceof BlockState ? RESERVED : RESERVED.toBaseBlock()); // set to reserved/empty
|
||||
}
|
||||
}
|
||||
@ -140,7 +140,7 @@ public class DisallowedBlocksExtent extends AbstractDelegateExtent implements IB
|
||||
}
|
||||
BlockState state = BlockTypesCache.states[block];
|
||||
if (blockedBlocks != null) {
|
||||
if (blockedBlocks.contains(state.getBlockType().getId())) {
|
||||
if (blockedBlocks.contains(state.getBlockType().id())) {
|
||||
blocks[i] = BlockTypesCache.ReservedIDs.__RESERVED__;
|
||||
continue;
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
|
||||
@Override
|
||||
public boolean setBiome(BlockVector3 position, BiomeType newBiome) {
|
||||
BiomeType oldBiome = this.getBiome(position);
|
||||
if (!oldBiome.getId().equals(newBiome.getId())) {
|
||||
if (!oldBiome.id().equals(newBiome.id())) {
|
||||
this.changeSet.addBiomeChange(position.x(), position.y(), position.z(), oldBiome, newBiome);
|
||||
return getExtent().setBiome(position, newBiome);
|
||||
} else {
|
||||
@ -121,7 +121,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
|
||||
@Override
|
||||
public boolean setBiome(int x, int y, int z, BiomeType newBiome) {
|
||||
BiomeType oldBiome = this.getBiome(mutable.setComponents(x, y, z));
|
||||
if (!oldBiome.getId().equals(newBiome.getId())) {
|
||||
if (!oldBiome.id().equals(newBiome.id())) {
|
||||
this.changeSet.addBiomeChange(x, y, z, oldBiome, newBiome);
|
||||
return getExtent().setBiome(x, y, z, newBiome);
|
||||
} else {
|
||||
|
@ -237,7 +237,7 @@ public class FastSchematicWriter implements ClipboardWriter {
|
||||
if (!brokenEntities) {
|
||||
loc = loc.setPosition(loc.add(min.toVector3()));
|
||||
}
|
||||
values.put("Id", new StringTag(state.getType().getId()));
|
||||
values.put("Id", new StringTag(state.getType().id()));
|
||||
values.put("Pos", writeVector(loc));
|
||||
values.put("Rotation", writeRotation(entity.getLocation()));
|
||||
|
||||
@ -297,7 +297,7 @@ public class FastSchematicWriter implements ClipboardWriter {
|
||||
for (int i = 0; i < paletteList.size(); i++) {
|
||||
int ordinal = paletteList.get(i);
|
||||
BiomeType state = BiomeTypes.get(ordinal);
|
||||
out12.writeNamedTag(state.getId(), i);
|
||||
out12.writeNamedTag(state.id(), i);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -183,7 +183,7 @@ public class MinecraftStructure implements ClipboardReader, ClipboardWriter {
|
||||
|
||||
indexes.put(combined, (Integer) palette.size());
|
||||
HashMap<String, Object> paletteEntry = new HashMap<>();
|
||||
paletteEntry.put("Name", type.getId());
|
||||
paletteEntry.put("Name", type.id());
|
||||
if (block.getInternalId() != type.getInternalId()) {
|
||||
Map<String, Object> properties = null;
|
||||
for (AbstractProperty property : (List<AbstractProperty<?>>) type.getProperties()) {
|
||||
@ -239,7 +239,7 @@ public class MinecraftStructure implements ClipboardReader, ClipboardWriter {
|
||||
Map<String, Tag> nbtMap = nbt.getValue();
|
||||
// Replace rotation data
|
||||
nbtMap.put("Rotation", writeRotation(entity.getLocation()));
|
||||
nbtMap.put("id", new StringTag(state.getType().getId()));
|
||||
nbtMap.put("id", new StringTag(state.getType().id()));
|
||||
Map<String, Object> entityMap = FaweCache.INSTANCE.asMap("pos", pos, "blockPos", blockPos, "nbt", nbt);
|
||||
entities.add(entityMap);
|
||||
}
|
||||
|
@ -346,7 +346,7 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
int lightLevel = iChunk.getEmittedLight(node.x() & 15, node.y(), node.z() & 15);
|
||||
BlockState state = this.queue.getBlock(node.x(), node.y(), node.z());
|
||||
String id = state.getBlockType().getId().toLowerCase(Locale.ROOT);
|
||||
String id = state.getBlockType().id().toLowerCase(Locale.ROOT);
|
||||
if (lightLevel <= 1) {
|
||||
continue;
|
||||
}
|
||||
@ -396,7 +396,7 @@ public class NMSRelighter implements Relighter {
|
||||
if (!(checkStairEast(state) && isStairOrTrueTop(state, top) && isSlabOrTrueValue(state, top ? "top" : "bottom"))) {
|
||||
break east;
|
||||
}
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
this.computeSpreadBlockLight(x + 1, y, z, currentLight, queue, visited);
|
||||
break east;
|
||||
}
|
||||
@ -449,7 +449,7 @@ public class NMSRelighter implements Relighter {
|
||||
if (!(checkStairWest(state) && isStairOrTrueTop(state, top) && isSlabOrTrueValue(state, top ? "top" : "bottom"))) {
|
||||
break west;
|
||||
}
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
this.computeSpreadBlockLight(x - 1, y, z, currentLight, queue, visited);
|
||||
break west;
|
||||
}
|
||||
@ -502,7 +502,7 @@ public class NMSRelighter implements Relighter {
|
||||
if (!(checkStairSouth(state) && isStairOrTrueTop(state, top) && isSlabOrTrueValue(state, top ? "top" : "bottom"))) {
|
||||
break south;
|
||||
}
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
this.computeSpreadBlockLight(x, y, z + 1, currentLight, queue, visited);
|
||||
break south;
|
||||
}
|
||||
@ -555,7 +555,7 @@ public class NMSRelighter implements Relighter {
|
||||
if (!(checkStairNorth(state) && isStairOrTrueTop(state, top) && isSlabOrTrueValue(state, top ? "top" : "bottom"))) {
|
||||
break north;
|
||||
}
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
this.computeSpreadBlockLight(x, y, z - 1, currentLight, queue, visited);
|
||||
break north;
|
||||
}
|
||||
@ -707,7 +707,7 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
|
||||
private boolean checkStairNorth(BlockState state) {
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
return true;
|
||||
}
|
||||
Direction direction = getStairDir(state);
|
||||
@ -725,7 +725,7 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
|
||||
private boolean checkStairSouth(BlockState state) {
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
return true;
|
||||
}
|
||||
Direction direction = getStairDir(state);
|
||||
@ -743,7 +743,7 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
|
||||
private boolean checkStairEast(BlockState state) {
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
return true;
|
||||
}
|
||||
Direction direction = getStairDir(state);
|
||||
@ -761,7 +761,7 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
|
||||
private boolean checkStairWest(BlockState state) {
|
||||
if (!state.getBlockType().getId().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
if (!state.getBlockType().id().toLowerCase(Locale.ROOT).contains("stair")) {
|
||||
return true;
|
||||
}
|
||||
Direction direction = getStairDir(state);
|
||||
@ -787,11 +787,11 @@ public class NMSRelighter implements Relighter {
|
||||
}
|
||||
|
||||
private boolean isStairOrTrueTop(BlockState state, boolean top) {
|
||||
return !state.getBlockType().getId().contains("stair") || state.getState(stairHalf).equals("top") == top;
|
||||
return !state.getBlockType().id().contains("stair") || state.getState(stairHalf).equals("top") == top;
|
||||
}
|
||||
|
||||
private boolean isSlabOrTrueValue(BlockState state, String value) {
|
||||
return !state.getBlockType().getId().contains("slab") || state.getState(slabHalf).equals(value);
|
||||
return !state.getBlockType().id().contains("slab") || state.getState(slabHalf).equals(value);
|
||||
}
|
||||
|
||||
private void computeRemoveBlockLight(
|
||||
|
@ -236,7 +236,7 @@ public class CavesGen extends GenBase {
|
||||
BlockState material = chunk.getBlock(bx + local_x, local_y, bz + local_z);
|
||||
BlockState materialAbove = chunk.getBlock(bx + local_x, local_y + 1, bz + local_z);
|
||||
BlockType blockType = material.getBlockType();
|
||||
switch (blockType.getId()) {
|
||||
switch (blockType.id()) {
|
||||
case "minecraft:mycelium", "minecraft:grass_block" -> grassFound = true;
|
||||
}
|
||||
if (this.isSuitableBlock(material, materialAbove)) {
|
||||
@ -277,7 +277,7 @@ public class CavesGen extends GenBase {
|
||||
}
|
||||
|
||||
protected boolean isSuitableBlock(BlockStateHolder material, BlockStateHolder materialAbove) {
|
||||
return switch (material.getBlockType().getId()) {
|
||||
return switch (material.getBlockType().id()) {
|
||||
case "minecraft:air", "minecraft:cave_air", "minecraft:void_air", "minecraft:water", "minecraft:lava", "minecraft:bedrock" -> false;
|
||||
default -> true;
|
||||
};
|
||||
|
@ -40,7 +40,7 @@ public abstract class ABlockMask extends AbstractExtentMask {
|
||||
List<BlockState> all = type.getAllStates();
|
||||
hasAll = all.stream().map(this::test).reduce(true, (a, b) -> a && b);
|
||||
if (hasAll) {
|
||||
strings.add(type.getId());
|
||||
strings.add(type.id());
|
||||
} else {
|
||||
for (BlockState state : all) {
|
||||
if (test(state)) {
|
||||
|
@ -183,7 +183,7 @@ public class BlockMaskBuilder {
|
||||
builders = new ArrayList<>();
|
||||
Pattern pattern = Pattern.compile("(minecraft:)?" + regex);
|
||||
for (BlockType type : BlockTypesCache.values) {
|
||||
if (pattern.matcher(type.getId()).find()) {
|
||||
if (pattern.matcher(type.id()).find()) {
|
||||
blockTypeList.add(type);
|
||||
builders.add(new FuzzyStateAllowingBuilder(type));
|
||||
add(type);
|
||||
@ -284,7 +284,7 @@ public class BlockMaskBuilder {
|
||||
} else {
|
||||
boolean success = false;
|
||||
for (BlockType myType : BlockTypesCache.values) {
|
||||
if (myType.getId().matches("(minecraft:)?" + input)) {
|
||||
if (myType.id().matches("(minecraft:)?" + input)) {
|
||||
add(myType);
|
||||
success = true;
|
||||
}
|
||||
@ -571,7 +571,7 @@ public class BlockMaskBuilder {
|
||||
throw new IllegalArgumentException(String.format(
|
||||
"Property %s cannot be applied to block type %s",
|
||||
property.getName(),
|
||||
type.getId()
|
||||
type.id()
|
||||
));
|
||||
}
|
||||
masked.computeIfAbsent(property, k -> new ArrayList<>()).add(index);
|
||||
|
@ -79,7 +79,7 @@ public class TypeSwapPattern extends AbstractExtentPattern {
|
||||
}
|
||||
|
||||
private BlockState getNewBlock(BlockState existing) {
|
||||
String oldId = existing.getBlockType().getId();
|
||||
String oldId = existing.getBlockType().id();
|
||||
String newId = oldId;
|
||||
if (inputPattern != null) {
|
||||
newId = inputPattern.matcher(oldId).replaceAll(outputString);
|
||||
|
@ -297,7 +297,7 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor {
|
||||
public void add(BlockChange change) {
|
||||
try {
|
||||
BlockVector3 loc = change.getPosition();
|
||||
BaseBlock from = change.getPrevious();
|
||||
BaseBlock from = change.previous();
|
||||
BaseBlock to = change.getCurrent();
|
||||
add(loc, from, to);
|
||||
} catch (Exception e) {
|
||||
|
@ -444,7 +444,7 @@ public class MainUtil {
|
||||
@Nonnull
|
||||
public static CompoundTag setEntityInfo(@Nonnull CompoundTag tag, @Nonnull Entity entity) {
|
||||
Map<String, Tag> map = new HashMap<>(tag.getValue());
|
||||
map.put("Id", new StringTag(entity.getState().getType().getId()));
|
||||
map.put("Id", new StringTag(entity.getState().getType().id()));
|
||||
ListTag pos = (ListTag) map.get("Pos");
|
||||
if (pos != null) {
|
||||
Location loc = entity.getLocation();
|
||||
|
@ -929,10 +929,10 @@ public class TextureUtil implements TextureHolder {
|
||||
}.getType();
|
||||
|
||||
for (BlockType blockType : BlockTypesCache.values) {
|
||||
if (!blockType.getMaterial().isFullCube() || blockType.getId().toLowerCase().contains("shulker")) {
|
||||
if (!blockType.getMaterial().isFullCube() || blockType.id().toLowerCase().contains("shulker")) {
|
||||
continue;
|
||||
}
|
||||
switch (blockType.getId().toLowerCase(Locale.ROOT)) {
|
||||
switch (blockType.id().toLowerCase(Locale.ROOT)) {
|
||||
case "slime_block":
|
||||
case "honey_block":
|
||||
case "mob_spawner":
|
||||
@ -940,7 +940,7 @@ public class TextureUtil implements TextureHolder {
|
||||
continue;
|
||||
}
|
||||
int combined = blockType.getInternalId();
|
||||
String id = blockType.getId();
|
||||
String id = blockType.id();
|
||||
String[] split = id.split(":", 2);
|
||||
String name = split.length == 1 ? id : split[1];
|
||||
String nameSpace = split.length == 1 ? "" : split[0];
|
||||
|
@ -196,7 +196,7 @@ public abstract class LocalConfiguration {
|
||||
BlockTypes.BEDROCK
|
||||
FAWE end*/
|
||||
);
|
||||
return blockTypes.stream().filter(Objects::nonNull).map(BlockType::getId).toArray(String[]::new);
|
||||
return blockTypes.stream().filter(Objects::nonNull).map(BlockType::id).toArray(String[]::new);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -277,7 +277,7 @@ public abstract class LocalConfiguration {
|
||||
id = Integer.parseInt(splitter[0]);
|
||||
data = Byte.parseByte(splitter[1]);
|
||||
}
|
||||
item = LegacyMapper.getInstance().getItemFromLegacy(id, data).getId();
|
||||
item = LegacyMapper.getInstance().getItemFromLegacy(id, data).id();
|
||||
} catch (Throwable ignored) {
|
||||
}
|
||||
|
||||
|
@ -1899,7 +1899,7 @@ public class LocalSession implements TextureHolder {
|
||||
*/
|
||||
@Deprecated
|
||||
public String getWandItem() {
|
||||
return wandItem.getType().getId();
|
||||
return wandItem.getType().id();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1910,7 +1910,7 @@ public class LocalSession implements TextureHolder {
|
||||
*/
|
||||
@Deprecated
|
||||
public String getNavWandItem() {
|
||||
return navWandItem.getType().getId();
|
||||
return navWandItem.getType().id();
|
||||
}
|
||||
|
||||
//FAWE start
|
||||
|
@ -129,7 +129,7 @@ public class BaseItem implements NbtValued {
|
||||
}
|
||||
}
|
||||
|
||||
return getType().getId() + nbtString;
|
||||
return getType().id() + nbtString;
|
||||
}
|
||||
//FAWE end
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ public class BiomeCommands {
|
||||
PaginationBox paginationBox = PaginationBox.fromComponents("Available Biomes", "/biomelist -p %page%",
|
||||
BiomeType.REGISTRY.values().stream()
|
||||
.map(biomeType -> TextComponent.builder()
|
||||
.append(biomeType.getId())
|
||||
.append(biomeType.id())
|
||||
.append(" (")
|
||||
.append(biomeRegistry.getRichName(biomeType))
|
||||
.append(")")
|
||||
@ -166,7 +166,7 @@ public class BiomeCommands {
|
||||
|
||||
List<Component> components = biomes.stream().map(biome ->
|
||||
biomeRegistry.getRichName(biome).hoverEvent(
|
||||
HoverEvent.showText(TextComponent.of(biome.getId()))
|
||||
HoverEvent.showText(TextComponent.of(biome.id()))
|
||||
)
|
||||
).collect(Collectors.toList());
|
||||
actor.print(Caption.of(messageKey, TextUtils.join(components, TextComponent.of(", "))));
|
||||
|
@ -349,7 +349,7 @@ public class GeneralCommands {
|
||||
if (world == null) {
|
||||
actor.print(Caption.of("worldedit.world.remove"));
|
||||
} else {
|
||||
actor.print(Caption.of("worldedit.world.set", TextComponent.of(world.getId())));
|
||||
actor.print(Caption.of("worldedit.world.set", TextComponent.of(world.id())));
|
||||
}
|
||||
}
|
||||
|
||||
@ -641,7 +641,7 @@ public class GeneralCommands {
|
||||
if (itemsOnly && searchType.hasBlockType()) {
|
||||
continue;
|
||||
}
|
||||
final String id = searchType.getId();
|
||||
final String id = searchType.id();
|
||||
if (id.contains(idMatch)) {
|
||||
Component name = searchType.getRichName();
|
||||
results.put(id, TextComponent.builder()
|
||||
|
@ -79,8 +79,6 @@ import com.sk89q.worldedit.util.formatting.text.format.TextColor;
|
||||
import com.sk89q.worldedit.world.World;
|
||||
import com.sk89q.worldedit.world.block.BlockState;
|
||||
import com.sk89q.worldedit.world.block.BlockType;
|
||||
import com.sk89q.worldedit.world.item.ItemType;
|
||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||
import com.sk89q.worldedit.world.storage.ChunkStore;
|
||||
import org.enginehub.piston.annotation.Command;
|
||||
import org.enginehub.piston.annotation.CommandContainer;
|
||||
@ -841,7 +839,7 @@ public class SelectionCommands {
|
||||
toolTip = TextComponent.of(state.getAsString());
|
||||
blockName = blockName.append(TextComponent.of("*"));
|
||||
} else {
|
||||
toolTip = TextComponent.of(blockType.getId());
|
||||
toolTip = TextComponent.of(blockType.id());
|
||||
}
|
||||
blockName = blockName.hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, toolTip));
|
||||
line.append(blockName);
|
||||
|
@ -65,7 +65,7 @@ public class WorldConverter implements ArgumentConverter<World> {
|
||||
@Override
|
||||
public List<String> getSuggestions(String input, InjectedValueAccess context) {
|
||||
return getWorlds()
|
||||
.map(World::getId)
|
||||
.map(World::id)
|
||||
.filter(world -> world.startsWith(input))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
@ -73,7 +73,7 @@ public class WorldConverter implements ArgumentConverter<World> {
|
||||
@Override
|
||||
public ConversionResult<World> convert(String s, InjectedValueAccess injectedValueAccess) {
|
||||
World result = getWorlds()
|
||||
.filter(world -> world.getId().equals(s))
|
||||
.filter(world -> world.id().equals(s))
|
||||
.findAny().orElse(null);
|
||||
return result == null
|
||||
? FailedConversion.from(new IllegalArgumentException(
|
||||
|
@ -66,7 +66,7 @@ public class BlockDataCyler implements DoubleActionBlockTool {
|
||||
|
||||
if (!config.allowedDataCycleBlocks.isEmpty()
|
||||
&& !player.hasPermission("worldedit.override.data-cycler")
|
||||
&& !config.allowedDataCycleBlocks.contains(block.getBlockType().getId())) {
|
||||
&& !config.allowedDataCycleBlocks.contains(block.getBlockType().id())) {
|
||||
player.print(Caption.of("worldedit.tool.data-cycler.block-not-permitted"));
|
||||
return true;
|
||||
}
|
||||
|
@ -135,42 +135,42 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||
private String woolMapper(String string) {
|
||||
switch (string.toLowerCase(Locale.ROOT)) {
|
||||
case "white":
|
||||
return BlockTypes.WHITE_WOOL.getId();
|
||||
return BlockTypes.WHITE_WOOL.id();
|
||||
case "black":
|
||||
return BlockTypes.BLACK_WOOL.getId();
|
||||
return BlockTypes.BLACK_WOOL.id();
|
||||
case "blue":
|
||||
return BlockTypes.BLUE_WOOL.getId();
|
||||
return BlockTypes.BLUE_WOOL.id();
|
||||
case "brown":
|
||||
return BlockTypes.BROWN_WOOL.getId();
|
||||
return BlockTypes.BROWN_WOOL.id();
|
||||
case "cyan":
|
||||
return BlockTypes.CYAN_WOOL.getId();
|
||||
return BlockTypes.CYAN_WOOL.id();
|
||||
case "gray":
|
||||
case "grey":
|
||||
return BlockTypes.GRAY_WOOL.getId();
|
||||
return BlockTypes.GRAY_WOOL.id();
|
||||
case "green":
|
||||
return BlockTypes.GREEN_WOOL.getId();
|
||||
return BlockTypes.GREEN_WOOL.id();
|
||||
case "light_blue":
|
||||
case "lightblue":
|
||||
return BlockTypes.LIGHT_BLUE_WOOL.getId();
|
||||
return BlockTypes.LIGHT_BLUE_WOOL.id();
|
||||
case "light_gray":
|
||||
case "light_grey":
|
||||
case "lightgray":
|
||||
case "lightgrey":
|
||||
return BlockTypes.LIGHT_GRAY_WOOL.getId();
|
||||
return BlockTypes.LIGHT_GRAY_WOOL.id();
|
||||
case "lime":
|
||||
return BlockTypes.LIME_WOOL.getId();
|
||||
return BlockTypes.LIME_WOOL.id();
|
||||
case "magenta":
|
||||
return BlockTypes.MAGENTA_WOOL.getId();
|
||||
return BlockTypes.MAGENTA_WOOL.id();
|
||||
case "orange":
|
||||
return BlockTypes.ORANGE_WOOL.getId();
|
||||
return BlockTypes.ORANGE_WOOL.id();
|
||||
case "pink":
|
||||
return BlockTypes.PINK_WOOL.getId();
|
||||
return BlockTypes.PINK_WOOL.id();
|
||||
case "purple":
|
||||
return BlockTypes.PURPLE_WOOL.getId();
|
||||
return BlockTypes.PURPLE_WOOL.id();
|
||||
case "yellow":
|
||||
return BlockTypes.YELLOW_WOOL.getId();
|
||||
return BlockTypes.YELLOW_WOOL.id();
|
||||
case "red":
|
||||
return BlockTypes.RED_WOOL.getId();
|
||||
return BlockTypes.RED_WOOL.id();
|
||||
default:
|
||||
return string;
|
||||
}
|
||||
@ -194,7 +194,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||
if (input.indexOf('[') == -1 && input.indexOf(']') == -1) {
|
||||
continue;
|
||||
}
|
||||
if (!type.getId().equalsIgnoreCase(input.substring(0, input.indexOf('[')))) {
|
||||
if (!type.id().equalsIgnoreCase(input.substring(0, input.indexOf('[')))) {
|
||||
continue;
|
||||
}
|
||||
String[] properties = input.substring(input.indexOf('[') + 1, input.indexOf(']')).split(",");
|
||||
@ -249,10 +249,10 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||
throw new NoMatchException(Caption.of(
|
||||
"worldedit.error.parser.unknown-property",
|
||||
TextComponent.of(parts[0]),
|
||||
TextComponent.of(type.getId())
|
||||
TextComponent.of(type.id())
|
||||
));
|
||||
} else {
|
||||
WorldEdit.logger.debug("Unknown property " + parts[0] + " for block " + type.getId());
|
||||
WorldEdit.logger.debug("Unknown property " + parts[0] + " for block " + type.id());
|
||||
}
|
||||
return Maps.newHashMap();
|
||||
}
|
||||
@ -516,20 +516,20 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||
//FAWE start - per-limit disallowed blocks
|
||||
if (actor != null) {
|
||||
if (!actor.hasPermission("worldedit.anyblock")
|
||||
&& worldEdit.getConfiguration().disallowedBlocks.contains(blockType.getId().toLowerCase(Locale.ROOT))) {
|
||||
&& worldEdit.getConfiguration().disallowedBlocks.contains(blockType.id().toLowerCase(Locale.ROOT))) {
|
||||
throw new DisallowedUsageException(Caption.of(
|
||||
"worldedit.error.disallowed-block",
|
||||
TextComponent.of(blockType.getId())
|
||||
TextComponent.of(blockType.id())
|
||||
));
|
||||
}
|
||||
FaweLimit limit = actor.getLimit();
|
||||
if (!limit.isUnlimited()) {
|
||||
// No need to account for blocked states/properties as it will simply return false in the equality check
|
||||
// during contains.
|
||||
if (limit.DISALLOWED_BLOCKS.contains(blockType.getId().toLowerCase(Locale.ROOT))) {
|
||||
if (limit.DISALLOWED_BLOCKS.contains(blockType.id().toLowerCase(Locale.ROOT))) {
|
||||
throw new DisallowedUsageException(Caption.of(
|
||||
"fawe.error.limit.disallowed-block",
|
||||
TextComponent.of(blockType.getId())
|
||||
TextComponent.of(blockType.id())
|
||||
));
|
||||
}
|
||||
}
|
||||
@ -559,14 +559,14 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
|
||||
if (ent == null) {
|
||||
throw new NoMatchException(Caption.of("worldedit.error.unknown-entity", TextComponent.of(mobName)));
|
||||
}
|
||||
mobName = ent.getId();
|
||||
mobName = ent.id();
|
||||
if (!worldEdit.getPlatformManager().queryCapability(Capability.USER_COMMANDS).isValidMobType(mobName)) {
|
||||
throw new NoMatchException(Caption.of("worldedit.error.unknown-mob", TextComponent.of(mobName)));
|
||||
}
|
||||
return validate(context, new MobSpawnerBlock(state, mobName));
|
||||
} else {
|
||||
//noinspection ConstantConditions
|
||||
return validate(context, new MobSpawnerBlock(state, EntityTypes.PIG.getId()));
|
||||
return validate(context, new MobSpawnerBlock(state, EntityTypes.PIG.id()));
|
||||
}
|
||||
} else if (blockType == BlockTypes.PLAYER_HEAD || blockType == BlockTypes.PLAYER_WALL_HEAD) {
|
||||
// allow setting type/player/rotation
|
||||
|
@ -71,7 +71,7 @@ public class BlockCategoryPatternParser extends InputParser<Pattern> implements
|
||||
|
||||
Set<BlockType> blocks = category.getAll();
|
||||
if (blocks.isEmpty()) {
|
||||
throw new InputParseException(Caption.of("worldedit.error.empty-tag", TextComponent.of(category.getId())));
|
||||
throw new InputParseException(Caption.of("worldedit.error.empty-tag", TextComponent.of(category.id())));
|
||||
}
|
||||
|
||||
if (anyState) {
|
||||
|
@ -233,7 +233,7 @@ public interface Platform extends Keyed {
|
||||
*/
|
||||
@NonAbstractForCompatibility(delegateName = "getPlatformName", delegateParams = {})
|
||||
@Override
|
||||
default String getId() {
|
||||
default String id() {
|
||||
return "legacy:" + getPlatformName().toLowerCase(Locale.ROOT).replaceAll("[^a-z_.-]", "_");
|
||||
}
|
||||
|
||||
|
@ -423,7 +423,7 @@ public interface Clipboard extends Extent, Iterable<BlockVector3>, Closeable, Fl
|
||||
if (pasteEntities) {
|
||||
for (Entity entity : this.getEntities()) {
|
||||
// skip players on pasting schematic
|
||||
if (entity.getState() != null && entity.getState().getType().getId()
|
||||
if (entity.getState() != null && entity.getState().getType().id()
|
||||
.equals("minecraft:player")) {
|
||||
continue;
|
||||
}
|
||||
|
@ -223,7 +223,7 @@ public class SpongeSchematicWriter implements ClipboardWriter {
|
||||
BlockVector3 pt = BlockVector3.at(x0, min.y(), z0);
|
||||
BiomeType biome = clipboard.getBiome(pt);
|
||||
|
||||
String biomeKey = biome.getId();
|
||||
String biomeKey = biome.id();
|
||||
int biomeId;
|
||||
if (palette.containsKey(biomeKey)) {
|
||||
biomeId = palette.get(biomeKey);
|
||||
@ -262,7 +262,7 @@ public class SpongeSchematicWriter implements ClipboardWriter {
|
||||
values.putAll(rawData.getValue());
|
||||
}
|
||||
values.remove("id");
|
||||
values.put("Id", new StringTag(state.getType().getId()));
|
||||
values.put("Id", new StringTag(state.getType().id()));
|
||||
final Location location = e.getLocation();
|
||||
values.put("Pos", writeVector(location.toVector()));
|
||||
values.put("Rotation", writeRotation(location));
|
||||
|
@ -84,7 +84,7 @@ public class FlowerPotCompatibilityHandler implements NBTCompatibilityHandler {
|
||||
} else {
|
||||
BlockState plantedWithData = LegacyMapper.getInstance().getBlockFromLegacy(newId, data);
|
||||
if (plantedWithData != null) {
|
||||
plantedName = plantedWithData.getBlockType().getId().substring(10); // remove "minecraft:"
|
||||
plantedName = plantedWithData.getBlockType().id().substring(10); // remove "minecraft:"
|
||||
}
|
||||
}
|
||||
if (plantedName != null) {
|
||||
|
@ -29,7 +29,7 @@ public class Pre13HangingCompatibilityHandler implements EntityNBTCompatibilityH
|
||||
|
||||
@Override
|
||||
public boolean isAffectedEntity(EntityType type, CompoundTag tag) {
|
||||
if (!type.getId().startsWith("minecraft:")) {
|
||||
if (!type.id().startsWith("minecraft:")) {
|
||||
return false;
|
||||
}
|
||||
boolean hasLegacyDirection = tag.containsKey("Dir") || tag.containsKey("Direction");
|
||||
|
@ -441,7 +441,7 @@ public class BlockTransformExtent extends ResettableExtent {
|
||||
if (Settings.settings().ENABLED_COMPONENTS.DEBUG) {
|
||||
LOGGER.warn(String.format(
|
||||
"Index outside direction array length found for block:{%s} property:{%s}",
|
||||
state.getBlockType().getId(),
|
||||
state.getBlockType().id(),
|
||||
property.getName()
|
||||
));
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ public class SnowSimulator implements LayerFunction {
|
||||
if (!above.getBlockType().getMaterial().isAir() && (!stack || above.getBlockType() != BlockTypes.SNOW)) {
|
||||
return false;
|
||||
//FAWE start
|
||||
} else if (!block.getBlockType().getId().toLowerCase(Locale.ROOT).contains("ice") && this.extent.getEmittedLight(
|
||||
} else if (!block.getBlockType().id().toLowerCase(Locale.ROOT).contains("ice") && this.extent.getEmittedLight(
|
||||
abovePosition) > 10) {
|
||||
return false;
|
||||
} else if (!block.getBlockType().getMaterial().isFullCube()) {
|
||||
@ -132,7 +132,7 @@ public class SnowSimulator implements LayerFunction {
|
||||
return false;
|
||||
}
|
||||
//FAWE end
|
||||
} else if (!block.getBlockType().getId().toLowerCase(Locale.ROOT).contains("ice") && block
|
||||
} else if (!block.getBlockType().id().toLowerCase(Locale.ROOT).contains("ice") && block
|
||||
.getBlockType()
|
||||
.getMaterial()
|
||||
.isTranslucent()) {
|
||||
|
@ -56,7 +56,7 @@ public class BlockOptimizedHistory extends ArrayListHistory {
|
||||
BlockChange blockChange = (BlockChange) change;
|
||||
BlockVector3 position = blockChange.getPosition();
|
||||
if (!previous.containsLocation(position)) {
|
||||
previous.add(position, blockChange.getPrevious());
|
||||
previous.add(position, blockChange.previous());
|
||||
}
|
||||
current.add(position, blockChange.getCurrent());
|
||||
} else {
|
||||
|
@ -165,7 +165,7 @@ public class ServerCUIHandler {
|
||||
structureTag.putString("mode", "SAVE");
|
||||
structureTag.putByte("ignoreEntities", (byte) 1);
|
||||
structureTag.putByte("showboundingbox", (byte) 1);
|
||||
structureTag.putString("id", BlockTypes.STRUCTURE_BLOCK.getId());
|
||||
structureTag.putString("id", BlockTypes.STRUCTURE_BLOCK.id());
|
||||
|
||||
return BlockTypes.STRUCTURE_BLOCK.getDefaultState().toBaseBlock(structureTag.build());
|
||||
//FAWE end
|
||||
|
@ -25,7 +25,7 @@ import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
//FAWE start - implements RegistryItem
|
||||
public abstract class Category<T extends Keyed> implements RegistryItem {
|
||||
public abstract class Category<T extends Keyed> implements RegistryItem, Keyed {
|
||||
//FAWE end
|
||||
|
||||
private final Set<T> set = new HashSet<>();
|
||||
@ -36,7 +36,8 @@ public abstract class Category<T extends Keyed> implements RegistryItem {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public final String getId() {
|
||||
@Override
|
||||
public final String id() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@ -81,7 +82,7 @@ public abstract class Category<T extends Keyed> implements RegistryItem {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getId();
|
||||
return id();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -114,7 +114,7 @@ public class PropertiesConfiguration extends LocalConfiguration {
|
||||
registerHelp = getBool("register-help", registerHelp);
|
||||
wandItem = getString("wand-item", wandItem);
|
||||
try {
|
||||
wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId();
|
||||
wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).id();
|
||||
} catch (Throwable ignored) {
|
||||
}
|
||||
superPickaxeDrop = getBool("super-pickaxe-drop-items", superPickaxeDrop);
|
||||
@ -124,7 +124,7 @@ public class PropertiesConfiguration extends LocalConfiguration {
|
||||
useInventoryCreativeOverride = getBool("use-inventory-creative-override", useInventoryCreativeOverride);
|
||||
navigationWand = getString("nav-wand-item", navigationWand);
|
||||
try {
|
||||
navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId();
|
||||
navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).id();
|
||||
} catch (Throwable ignored) {
|
||||
}
|
||||
navigationWandMaxDistance = getInt("nav-wand-distance", navigationWandMaxDistance);
|
||||
|
@ -78,7 +78,7 @@ public class NullWorld extends AbstractWorld {
|
||||
//FAWE end
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return "null";
|
||||
}
|
||||
|
||||
|
@ -419,7 +419,7 @@ public interface World extends Extent, Keyed, IChunkCache<IChunkGet> {
|
||||
}
|
||||
|
||||
@Override
|
||||
default String getId() {
|
||||
default String id() {
|
||||
return getName().replace(" ", "_").toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
|
@ -291,7 +291,7 @@ public final class BiomeTypes {
|
||||
}
|
||||
|
||||
public static BiomeType register(final BiomeType biome) {
|
||||
return BiomeType.REGISTRY.register(biome.getId(), biome);
|
||||
return BiomeType.REGISTRY.register(biome.id(), biome);
|
||||
}
|
||||
|
||||
public static BiomeType getLegacy(int legacyId) {
|
||||
|
@ -154,7 +154,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
|
||||
String input = key.toString();
|
||||
throw new SuggestInputParseException(Caption.of("fawe.error.invalid-block-type", TextComponent.of(input)), () -> Stream.of(
|
||||
BlockTypesCache.values)
|
||||
.map(BlockType::getId)
|
||||
.map(BlockType::id)
|
||||
.filter(id -> StringMan.blockStateMatches(input, id))
|
||||
.sorted(StringMan.blockStateComparator(input))
|
||||
.collect(Collectors.toList())
|
||||
|
@ -204,14 +204,14 @@ public interface BlockStateHolder<B extends BlockStateHolder<B>> extends TileEnt
|
||||
|
||||
default String getAsString() {
|
||||
if (getStates().isEmpty()) {
|
||||
return this.getBlockType().getId();
|
||||
return this.getBlockType().id();
|
||||
} else {
|
||||
String properties = getStates().entrySet().stream()
|
||||
.map(entry -> entry.getKey().getName()
|
||||
+ "="
|
||||
+ entry.getValue().toString().toLowerCase(Locale.ROOT))
|
||||
.collect(Collectors.joining(","));
|
||||
return this.getBlockType().getId() + "[" + properties + "]";
|
||||
return this.getBlockType().id() + "[" + properties + "]";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -124,7 +124,7 @@ public class BlockType implements Keyed, Pattern {
|
||||
* @return The id
|
||||
*/
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@ -135,13 +135,13 @@ public class BlockType implements Keyed, Pattern {
|
||||
|
||||
//FAWE start
|
||||
public String getNamespace() {
|
||||
String id = getId();
|
||||
String id = id();
|
||||
int i = id.indexOf(':');
|
||||
return i == -1 ? "minecraft" : id.substring(0, i);
|
||||
}
|
||||
|
||||
public String getResource() {
|
||||
String id = getId();
|
||||
String id = id();
|
||||
return id.substring(id.indexOf(':') + 1);
|
||||
}
|
||||
//FAWE end
|
||||
@ -156,7 +156,7 @@ public class BlockType implements Keyed, Pattern {
|
||||
public String getName() {
|
||||
String name = this.name.getValue();
|
||||
if (name == null || name.isEmpty()) {
|
||||
return getId();
|
||||
return id();
|
||||
}
|
||||
return name;
|
||||
}
|
||||
@ -180,7 +180,7 @@ public class BlockType implements Keyed, Pattern {
|
||||
LOGGER.error(
|
||||
"Attempted to load blockstate with id {} of type {} outside of state ordinals length. Using default state.",
|
||||
propertyId,
|
||||
getId()
|
||||
id()
|
||||
);
|
||||
return settings.defaultState;
|
||||
}
|
||||
@ -189,7 +189,7 @@ public class BlockType implements Keyed, Pattern {
|
||||
LOGGER.error(
|
||||
"Attempted to load blockstate with ordinal {} of type {} outside of states length. Using default state. Using default state.",
|
||||
ordinal,
|
||||
getId()
|
||||
id()
|
||||
);
|
||||
return settings.defaultState;
|
||||
}
|
||||
@ -405,7 +405,7 @@ public class BlockType implements Keyed, Pattern {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getId();
|
||||
return id();
|
||||
}
|
||||
|
||||
//FAWE start
|
||||
|
@ -2235,8 +2235,8 @@ public final class BlockTypes {
|
||||
|
||||
throw new SuggestInputParseException(Caption.of("fawe.error.invalid-block-type", TextComponent.of(input)), () -> Stream.of(
|
||||
BlockTypesCache.values)
|
||||
.filter(b -> StringMan.blockStateMatches(inputLower, b.getId()))
|
||||
.map(BlockType::getId)
|
||||
.filter(b -> StringMan.blockStateMatches(inputLower, b.id()))
|
||||
.map(BlockType::id)
|
||||
.sorted(StringMan.blockStateComparator(inputLower))
|
||||
.collect(Collectors.toList())
|
||||
);
|
||||
|
@ -125,7 +125,7 @@ public class AnvilChunk13 implements Chunk {
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new InvalidFormatException("Invalid block state for " + blockState
|
||||
.getBlockType()
|
||||
.getId() + ", " + property.getName() + ": " + value);
|
||||
.id() + ", " + property.getName() + ": " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ public class AnvilChunk17 implements Chunk {
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new InvalidFormatException("Invalid block state for " + blockState
|
||||
.getBlockType()
|
||||
.getId() + ", " + property.getName() + ": " + value);
|
||||
.id() + ", " + property.getName() + ": " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -146,7 +146,7 @@ public class AnvilChunk18 implements Chunk {
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new InvalidFormatException("Invalid block state for " + blockState
|
||||
.getBlockType()
|
||||
.getId() + ", " + property.getName() + ": " + value);
|
||||
.id() + ", " + property.getName() + ": " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ public final class FluidCategories {
|
||||
}
|
||||
|
||||
public static FluidCategory register(final FluidCategory tag) {
|
||||
return FluidCategory.REGISTRY.register(tag.getId(), tag);
|
||||
return FluidCategory.REGISTRY.register(tag.id(), tag);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
@ -40,7 +40,7 @@ public final class FluidTypes {
|
||||
}
|
||||
|
||||
public static FluidType register(final FluidType fluid) {
|
||||
return FluidType.REGISTRY.register(fluid.getId(), fluid);
|
||||
return FluidType.REGISTRY.register(fluid.id(), fluid);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
@ -36,7 +36,7 @@ public final class GameModes {
|
||||
}
|
||||
|
||||
public static GameMode register(final GameMode gameMode) {
|
||||
return GameMode.REGISTRY.register(gameMode.getId(), gameMode);
|
||||
return GameMode.REGISTRY.register(gameMode.id(), gameMode);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
@ -49,7 +49,7 @@ public class ItemType implements RegistryItem, Keyed {
|
||||
.getRegistries().getItemRegistry().getName(this),
|
||||
""
|
||||
);
|
||||
return name.isEmpty() ? getId() : name;
|
||||
return name.isEmpty() ? id() : name;
|
||||
});
|
||||
@SuppressWarnings("this-escape")
|
||||
private transient final LazyReference<Component> richName = LazyReference.from(() ->
|
||||
@ -76,7 +76,7 @@ public class ItemType implements RegistryItem, Keyed {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
public String id() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@ -153,7 +153,7 @@ public class ItemType implements RegistryItem, Keyed {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getId();
|
||||
return id();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -41,7 +41,7 @@ public class BundledBlockRegistry implements BlockRegistry {
|
||||
|
||||
@Override
|
||||
public Component getRichName(BlockType blockType) {
|
||||
BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.getId());
|
||||
BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.id());
|
||||
if (blockEntry != null) {
|
||||
// This is more likely to be "right", but not translated
|
||||
// Some vanilla MC blocks have overrides so we need this name here
|
||||
@ -50,7 +50,7 @@ public class BundledBlockRegistry implements BlockRegistry {
|
||||
return TextComponent.of(blockEntry.localizedName);
|
||||
}
|
||||
return Caption.of(
|
||||
TranslationManager.makeTranslationKey("block", blockType.getId())
|
||||
TranslationManager.makeTranslationKey("block", blockType.id())
|
||||
);
|
||||
}
|
||||
|
||||
@ -60,14 +60,14 @@ public class BundledBlockRegistry implements BlockRegistry {
|
||||
// dumb_intellij.jpg - Ok??
|
||||
@SuppressWarnings("deprecation")
|
||||
public String getName(BlockType blockType) {
|
||||
BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.getId());
|
||||
BundledBlockData.BlockEntry blockEntry = BundledBlockData.getInstance().findById(blockType.id());
|
||||
return blockEntry != null ? blockEntry.localizedName : null;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public BlockMaterial getMaterial(BlockType blockType) {
|
||||
return new PassthroughBlockMaterial(BundledBlockData.getInstance().getMaterialById(blockType.getId()));
|
||||
return new PassthroughBlockMaterial(BundledBlockData.getInstance().getMaterialById(blockType.id()));
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
@ -34,7 +34,7 @@ import javax.annotation.Nullable;
|
||||
public class BundledItemRegistry implements ItemRegistry {
|
||||
|
||||
private BundledItemData.ItemEntry getEntryById(ItemType itemType) {
|
||||
return BundledItemData.getInstance().findById(itemType.getId());
|
||||
return BundledItemData.getInstance().findById(itemType.id());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -48,7 +48,7 @@ public class BundledItemRegistry implements ItemRegistry {
|
||||
return TextComponent.of(itemEntry.localizedName);
|
||||
}
|
||||
return Caption.of(
|
||||
TranslationManager.makeTranslationKey("item", itemType.getId())
|
||||
TranslationManager.makeTranslationKey("item", itemType.id())
|
||||
);
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ public class BundledItemRegistry implements ItemRegistry {
|
||||
if (itemEntry != null) {
|
||||
String localized = itemEntry.localizedName;
|
||||
if (localized.equals("Air")) {
|
||||
String id = itemType.getId();
|
||||
String id = itemType.id();
|
||||
int c = id.indexOf(':');
|
||||
return c < 0 ? id : id.substring(c + 1);
|
||||
}
|
||||
@ -74,7 +74,7 @@ public class BundledItemRegistry implements ItemRegistry {
|
||||
@Nullable
|
||||
@Override
|
||||
public ItemMaterial getMaterial(ItemType itemType) {
|
||||
return new PassthroughItemMaterial(BundledItemData.getInstance().getMaterialById(itemType.getId()));
|
||||
return new PassthroughItemMaterial(BundledItemData.getInstance().getMaterialById(itemType.id()));
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ public interface CategoryRegistry<T extends Keyed> {
|
||||
Set<T> getCategorisedByName(String category);
|
||||
|
||||
default Set<T> getAll(final Category<T> category) {
|
||||
return getCategorisedByName(category.getId());
|
||||
return getCategorisedByName(category.id());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ public class NullBiomeRegistry implements BiomeRegistry {
|
||||
@Override
|
||||
public Component getRichName(BiomeType biomeType) {
|
||||
return Caption.of(
|
||||
TranslationManager.makeTranslationKey("biome", biomeType.getId())
|
||||
TranslationManager.makeTranslationKey("biome", biomeType.id())
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@ public final class WeatherTypes {
|
||||
}
|
||||
|
||||
public static WeatherType register(WeatherType weather) {
|
||||
return WeatherType.REGISTRY.register(weather.getId(), weather);
|
||||
return WeatherType.REGISTRY.register(weather.id(), weather);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren