Skip to content

Commit

Permalink
Cleanup registry init
Browse files Browse the repository at this point in the history
  • Loading branch information
@me4502
me4502 committed Jul 24, 2024
1 parent f5eefc0 commit ce4b29f
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 39 deletions.
7 changes: 5 additions & 2 deletions worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ private BukkitAdapter() {

static {
TO_BLOCK_CONTEXT.setRestricted(false);
TO_BLOCK_CONTEXT.setTryLegacy(false);
}

/**
Expand Down Expand Up @@ -334,7 +335,8 @@ public static Entity adapt(org.bukkit.entity.Entity entity) {
*/
public static Material adapt(ItemType itemType) {
checkNotNull(itemType);
return Material.matchMaterial(itemType.id());
var key = checkNotNull(NamespacedKey.fromString(itemType.id()), "Item type key is invalid");
return Registry.MATERIAL.get(key);
}

/**
Expand All @@ -345,7 +347,8 @@ public static Material adapt(ItemType itemType) {
*/
public static Material adapt(BlockType blockType) {
checkNotNull(blockType);
return Material.matchMaterial(blockType.id());
var key = checkNotNull(NamespacedKey.fromString(blockType.id()), "Item type key is invalid");
return Registry.MATERIAL.get(key);
}

/**
Expand Down
13 changes: 8 additions & 5 deletions worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,9 @@ private void initializeRegistries() {
});
// Block & Item
Registry.MATERIAL.forEach(material -> {
String key = material.getKey().toString();
if (material.isBlock()) {
BlockType.REGISTRY.register(material.getKey().toString(), new BlockType(material.getKey().toString(), blockState -> {
BlockType.REGISTRY.register(key, new BlockType(key, blockState -> {
// TODO Use something way less hacky than this.
ParserContext context = new ParserContext();
context.setPreferringWildcard(true);
Expand All @@ -234,13 +235,13 @@ private void initializeRegistries() {
}
return defaultState;
} catch (InputParseException e) {
getLogger().log(Level.WARNING, "Error loading block state for " + material.getKey(), e);
getLogger().log(Level.WARNING, "Error loading block state for " + key, e);
return blockState;
}
}));
}
if (material.isItem()) {
ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString()));
ItemType.REGISTRY.register(key, new ItemType(key));
}
});
// Entity
Expand All @@ -262,10 +263,12 @@ private void initializeRegistries() {
private void setupTags() {
// Tags
for (Tag<Material> blockTag : Bukkit.getTags(Tag.REGISTRY_BLOCKS, Material.class)) {
BlockCategory.REGISTRY.register(blockTag.getKey().toString(), new BlockCategory(blockTag.getKey().toString()));
String key = blockTag.getKey().toString();
BlockCategory.REGISTRY.register(key, new BlockCategory(key));
}
for (Tag<Material> itemTag : Bukkit.getTags(Tag.REGISTRY_ITEMS, Material.class)) {
ItemCategory.REGISTRY.register(itemTag.getKey().toString(), new ItemCategory(itemTag.getKey().toString()));
String key = itemTag.getKey().toString();
ItemCategory.REGISTRY.register(key, new ItemCategory(key));
}
}

Expand Down
40 changes: 24 additions & 16 deletions worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,38 +218,44 @@ private FabricPermissionsProvider getInitialPermissionsProvider() {
private void setupRegistries(MinecraftServer server) {
// Blocks
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.BLOCK).keySet()) {
if (BlockType.REGISTRY.get(name.toString()) == null) {
BlockType.REGISTRY.register(name.toString(), new BlockType(name.toString(),
String key = name.toString();
if (BlockType.REGISTRY.get(key) == null) {
BlockType.REGISTRY.register(key, new BlockType(key,
input -> FabricAdapter.adapt(FabricAdapter.adapt(input.getBlockType()).defaultBlockState())));
}
}
// Items
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.ITEM).keySet()) {
if (ItemType.REGISTRY.get(name.toString()) == null) {
ItemType.REGISTRY.register(name.toString(), new ItemType(name.toString()));
String key = name.toString();
if (ItemType.REGISTRY.get(key) == null) {
ItemType.REGISTRY.register(key, new ItemType(key));
}
}
// Entities
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.ENTITY_TYPE).keySet()) {
if (EntityType.REGISTRY.get(name.toString()) == null) {
EntityType.REGISTRY.register(name.toString(), new EntityType(name.toString()));
String key = name.toString();
if (EntityType.REGISTRY.get(key) == null) {
EntityType.REGISTRY.register(key, new EntityType(key));
}
}
// Biomes
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.BIOME).keySet()) {
if (BiomeType.REGISTRY.get(name.toString()) == null) {
BiomeType.REGISTRY.register(name.toString(), new BiomeType(name.toString()));
String key = name.toString();
if (BiomeType.REGISTRY.get(key) == null) {
BiomeType.REGISTRY.register(key, new BiomeType(key));
}
}
// Tags
server.registryAccess().registryOrThrow(Registries.BLOCK).getTagNames().map(TagKey::location).forEach(name -> {
if (BlockCategory.REGISTRY.get(name.toString()) == null) {
BlockCategory.REGISTRY.register(name.toString(), new BlockCategory(name.toString()));
String key = name.toString();
if (BlockCategory.REGISTRY.get(key) == null) {
BlockCategory.REGISTRY.register(key, new BlockCategory(key));
}
});
server.registryAccess().registryOrThrow(Registries.ITEM).getTagNames().map(TagKey::location).forEach(name -> {
if (ItemCategory.REGISTRY.get(name.toString()) == null) {
ItemCategory.REGISTRY.register(name.toString(), new ItemCategory(name.toString()));
String key = name.toString();
if (ItemCategory.REGISTRY.get(key) == null) {
ItemCategory.REGISTRY.register(key, new ItemCategory(key));
}
});
Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
Expand All @@ -269,14 +275,16 @@ private void setupRegistries(MinecraftServer server) {
});
// Features
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).keySet()) {
if (ConfiguredFeatureType.REGISTRY.get(name.toString()) == null) {
ConfiguredFeatureType.REGISTRY.register(name.toString(), new ConfiguredFeatureType(name.toString()));
String key = name.toString();
if (ConfiguredFeatureType.REGISTRY.get(key) == null) {
ConfiguredFeatureType.REGISTRY.register(key, new ConfiguredFeatureType(key));
}
}
// Structures
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.STRUCTURE).keySet()) {
if (StructureType.REGISTRY.get(name.toString()) == null) {
StructureType.REGISTRY.register(name.toString(), new StructureType(name.toString()));
String key = name.toString();
if (StructureType.REGISTRY.get(key) == null) {
StructureType.REGISTRY.register(key, new StructureType(key));
}
}
}
Expand Down
40 changes: 24 additions & 16 deletions worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,38 +157,44 @@ private void setupPlatform() {
private void setupRegistries(MinecraftServer server) {
// Blocks
for (ResourceLocation name : BuiltInRegistries.BLOCK.keySet()) {
if (BlockType.REGISTRY.get(name.toString()) == null) {
BlockType.REGISTRY.register(name.toString(), new BlockType(name.toString(),
String key = name.toString();
if (BlockType.REGISTRY.get(key) == null) {
BlockType.REGISTRY.register(key, new BlockType(key,
input -> NeoForgeAdapter.adapt(NeoForgeAdapter.adapt(input.getBlockType()).defaultBlockState())));
}
}
// Items
for (ResourceLocation name : BuiltInRegistries.ITEM.keySet()) {
if (ItemType.REGISTRY.get(name.toString()) == null) {
ItemType.REGISTRY.register(name.toString(), new ItemType(name.toString()));
String key = name.toString();
if (ItemType.REGISTRY.get(key) == null) {
ItemType.REGISTRY.register(key, new ItemType(key));
}
}
// Entities
for (ResourceLocation name : BuiltInRegistries.ENTITY_TYPE.keySet()) {
if (EntityType.REGISTRY.get(name.toString()) == null) {
EntityType.REGISTRY.register(name.toString(), new EntityType(name.toString()));
String key = name.toString();
if (EntityType.REGISTRY.get(key) == null) {
EntityType.REGISTRY.register(key, new EntityType(key));
}
}
// Biomes
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.BIOME).keySet()) {
if (BiomeType.REGISTRY.get(name.toString()) == null) {
BiomeType.REGISTRY.register(name.toString(), new BiomeType(name.toString()));
String key = name.toString();
if (BiomeType.REGISTRY.get(key) == null) {
BiomeType.REGISTRY.register(key, new BiomeType(key));
}
}
// Tags
server.registryAccess().registryOrThrow(Registries.BLOCK).getTagNames().map(TagKey::location).forEach(name -> {
if (BlockCategory.REGISTRY.get(name.toString()) == null) {
BlockCategory.REGISTRY.register(name.toString(), new BlockCategory(name.toString()));
String key = name.toString();
if (BlockCategory.REGISTRY.get(key) == null) {
BlockCategory.REGISTRY.register(key, new BlockCategory(key));
}
});
server.registryAccess().registryOrThrow(Registries.ITEM).getTagNames().map(TagKey::location).forEach(name -> {
if (ItemCategory.REGISTRY.get(name.toString()) == null) {
ItemCategory.REGISTRY.register(name.toString(), new ItemCategory(name.toString()));
String key = name.toString();
if (ItemCategory.REGISTRY.get(key) == null) {
ItemCategory.REGISTRY.register(key, new ItemCategory(key));
}
});
Registry<Biome> biomeRegistry = server.registryAccess().registryOrThrow(Registries.BIOME);
Expand All @@ -208,14 +214,16 @@ private void setupRegistries(MinecraftServer server) {
});
// Features
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).keySet()) {
if (ConfiguredFeatureType.REGISTRY.get(name.toString()) == null) {
ConfiguredFeatureType.REGISTRY.register(name.toString(), new ConfiguredFeatureType(name.toString()));
String key = name.toString();
if (ConfiguredFeatureType.REGISTRY.get(key) == null) {
ConfiguredFeatureType.REGISTRY.register(key, new ConfiguredFeatureType(key));
}
}
// Structures
for (ResourceLocation name : server.registryAccess().registryOrThrow(Registries.STRUCTURE).keySet()) {
if (StructureType.REGISTRY.get(name.toString()) == null) {
StructureType.REGISTRY.register(name.toString(), new StructureType(name.toString()));
String key = name.toString();
if (StructureType.REGISTRY.get(key) == null) {
StructureType.REGISTRY.register(key, new StructureType(key));
}
}
}
Expand Down

0 comments on commit ce4b29f

Please sign in to comment.