Skip to content

Commit

Permalink
Rename some variables to improve readability of the code
Browse files Browse the repository at this point in the history
(cherry picked from commit 9393286)
  • Loading branch information
theEvilReaper authored and TheMeinerLP committed Jan 5, 2025
1 parent 57ad62a commit 04e66b9
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions src/main/java/net/minestom/server/gamedata/tags/Tag.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,25 +90,24 @@ public NamespaceID getName() {

public enum BasicType {
BLOCKS("minecraft:block", Registry.Resource.BLOCK_TAGS,
name -> Optional.ofNullable(Block.fromNamespaceId(name)).map(Block::id)),
blockName -> Optional.ofNullable(Block.fromNamespaceId(blockName)).map(Block::id)),
ITEMS("minecraft:item", Registry.Resource.ITEM_TAGS,
name -> Optional.ofNullable(Material.fromNamespaceId(name)).map(Material::id)),
itemName -> Optional.ofNullable(Material.fromNamespaceId(itemName)).map(Material::id)),
FLUIDS("minecraft:fluid", Registry.Resource.FLUID_TAGS,
name -> Optional.ofNullable(Fluid.fromNamespaceId(name)).map(Fluid::id)),
fluidName -> Optional.ofNullable(Fluid.fromNamespaceId(fluidName)).map(Fluid::id)),
BIOMES("minecraft:worldgen/biome", Registry.Resource.BIOME_TAGS,
name -> Optional.of(DynamicRegistry.Key.of(name)).map(DynamicRegistry.Key::namespace).map(MinecraftServer.getBiomeRegistry()::getId)),
biomeName -> Optional.of(DynamicRegistry.Key.of(biomeName)).map(DynamicRegistry.Key::namespace).map(MinecraftServer.getBiomeRegistry()::getId)),
ENTITY_TYPES("minecraft:entity_type", Registry.Resource.ENTITY_TYPE_TAGS,
name -> Optional.ofNullable(EntityType.fromNamespaceId(name)).map(EntityType::id)),
entityName -> Optional.ofNullable(EntityType.fromNamespaceId(entityName)).map(EntityType::id)),
GAME_EVENTS("minecraft:game_event", Registry.Resource.GAMEPLAY_TAGS,
name -> Optional.ofNullable(GameEvent.fromNamespaceId(name)).map(GameEvent::id)),
eventName -> Optional.ofNullable(GameEvent.fromNamespaceId(eventName)).map(GameEvent::id)),
SOUND_EVENTS("minecraft:sound_event", null, null), // Seems not to be included in server data
POTION_EFFECTS("minecraft:sound_event", null, null), // Seems not to be included in server data

//todo this is cursed. it does not update as the registry changes. Fix later.
ENCHANTMENTS("minecraft:enchantment", Registry.Resource.ENCHANTMENT_TAGS,
name -> Optional.of(DynamicRegistry.Key.of(name)).map(DynamicRegistry.Key::namespace).map(MinecraftServer.getEnchantmentRegistry()::getId)),;
enchName -> Optional.of(DynamicRegistry.Key.of(enchName)).map(DynamicRegistry.Key::namespace).map(MinecraftServer.getEnchantmentRegistry()::getId)),;

private final static BasicType[] VALUES = values();
private static final BasicType[] VALUES = values();
private final String identifier;
private final Registry.Resource resource;
private final Function<String, Optional<Integer>> function;
Expand Down

0 comments on commit 04e66b9

Please sign in to comment.