Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Rename registry resource enum

Browse Source
This commit is contained in:
TheMode 2021-07-28 13:02:12 +02:00
parent ec6bcf2d01
commit 8dff4227eb
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/entity/EntityTypeLoader.java
View File

@ -97,13 +97,11 @@ final class EntityTypeLoader {
static { static {
// Load data from file // Load data from file
JsonObject entities = Registry.load(Registry.Resource.ENTITY); JsonObject entities = Registry.load(Registry.Resource.ENTITIES);
entities.entrySet().forEach(entry -> { entities.entrySet().forEach(entry -> {
final String namespace = entry.getKey(); final String namespace = entry.getKey();
final JsonObject entityObject = entry.getValue().getAsJsonObject(); final JsonObject entityObject = entry.getValue().getAsJsonObject();
final var metaSupplier = ENTITY_META_SUPPLIER.get(namespace);
final var entityType = new EntityTypeImpl(Registry.entity(namespace, entityObject, null)); final var entityType = new EntityTypeImpl(Registry.entity(namespace, entityObject, null));
ENTITY_ID_MAP.put(entityType.id(), entityType); ENTITY_ID_MAP.put(entityType.id(), entityType);
NAMESPACE_MAP.put(namespace, entityType); NAMESPACE_MAP.put(namespace, entityType);

2
src/main/java/net/minestom/server/instance/block/BlockLoader.java
View File

@ -53,7 +53,7 @@ final class BlockLoader {
static { static {
// Load data from file // Load data from file
JsonObject blocks = Registry.load(Registry.Resource.BLOCK); JsonObject blocks = Registry.load(Registry.Resource.BLOCKS);
blocks.entrySet().forEach(entry -> { blocks.entrySet().forEach(entry -> {
final String blockNamespace = entry.getKey(); final String blockNamespace = entry.getKey();
final JsonObject blockObject = entry.getValue().getAsJsonObject(); final JsonObject blockObject = entry.getValue().getAsJsonObject();

2
src/main/java/net/minestom/server/item/MaterialLoader.java
View File

@ -45,7 +45,7 @@ final class MaterialLoader {
static { static {
// Load data from file // Load data from file
JsonObject materials = Registry.load(Registry.Resource.ITEM); JsonObject materials = Registry.load(Registry.Resource.ITEMS);
materials.entrySet().forEach(entry -> { materials.entrySet().forEach(entry -> {
final String namespace = entry.getKey(); final String namespace = entry.getKey();
final JsonObject materialObject = entry.getValue().getAsJsonObject(); final JsonObject materialObject = entry.getValue().getAsJsonObject();

6
src/main/java/net/minestom/server/registry/Registry.java
View File

@ -40,9 +40,9 @@ public class Registry {
} }
public enum Resource { public enum Resource {
BLOCK("blocks"), BLOCKS("blocks"),
ITEM("items"), ITEMS("items"),
ENTITY("entities"); ENTITIES("entities");
private final String name; private final String name;