diff --git a/src/main/java/com/replaymod/replaystudio/protocol/registry/DimensionType.java b/src/main/java/com/replaymod/replaystudio/protocol/registry/DimensionType.java index 3d574b2..730e815 100644 --- a/src/main/java/com/replaymod/replaystudio/protocol/registry/DimensionType.java +++ b/src/main/java/com/replaymod/replaystudio/protocol/registry/DimensionType.java @@ -110,7 +110,7 @@ public static DimensionType fromRegistry(Registries registries, String name) { if (registries == null) { return new DimensionType(name); } - Registries.Entry entry = registries.getEntry("minecraft:dimension_type", name); + Registries.Entry entry = registries.getEntry("dimension_type", name); if (entry == null) { return new DimensionType(name); } @@ -118,7 +118,7 @@ public static DimensionType fromRegistry(Registries registries, String name) { } public static DimensionType fromRegistry(Registries registries, int id) { - Registries.Entry entry = registries.getEntry("minecraft:dimension_type", id); + Registries.Entry entry = registries.getEntry("dimension_type", id); if (entry == null) { return new DimensionType(new CompoundTag(), "", id); } diff --git a/src/main/java/com/replaymod/replaystudio/protocol/registry/Registries.java b/src/main/java/com/replaymod/replaystudio/protocol/registry/Registries.java index c2be0cb..7bf4712 100644 --- a/src/main/java/com/replaymod/replaystudio/protocol/registry/Registries.java +++ b/src/main/java/com/replaymod/replaystudio/protocol/registry/Registries.java @@ -54,12 +54,15 @@ public Registries copy() { public Entry getEntry(String registryName, String entryName) { if (registriesTag != null) { CompoundTag registry = registriesTag.get(registryName); + if (registry == null) { + registry = registriesTag.get("minecraft:" + registryName); + } if (registry == null) return null; ListTag entries = registry.get("value"); if (entries == null) return null; for (Tag entry : entries) { StringTag name = ((CompoundTag) entry).get("name"); - if (name != null && name.getValue().equals(entryName)) { + if (name != null && (name.getValue().equals(entryName) || name.getValue().equals("minecraft:" + entryName))) { NumberTag id = ((CompoundTag) entry).get("id"); Tag value = ((CompoundTag) entry).get("element"); return new Entry(id == null ? 0 : id.asInt(), name.getValue(), value); @@ -85,6 +88,9 @@ public Entry getEntry(String registryName, String entryName) { public Entry getEntry(String registryName, int entryId) { if (registriesTag != null) { CompoundTag registry = registriesTag.get(registryName); + if (registry == null) { + registry = registriesTag.get("minecraft:" + registryName); + } if (registry == null) return null; ListTag entries = registry.get("value"); if (entries == null) return null;