Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

fix(fabric): fix issues with Fabric 1.21.5

Browse Source
This commit is contained in:
William278
2025-05-26 21:18:45 +01:00
parent c51ba85f38
commit 935aafa74a
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/net/william278/husksync/data/SerializerRegistry.java
View File

@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.*;
import java.util.logging.Level;
import java.util.stream.Collectors;
public interface SerializerRegistry {
@@ -40,7 +41,7 @@ public interface SerializerRegistry {
* @since 3.0
*/
@NotNull
<T extends Data> TreeMap<Identifier, Serializer<T>> getSerializers();
<T extends Data> Map<Identifier, Serializer<T>> getSerializers();
/**
* Register a data serializer for the given {@link Identifier}
@@ -87,8 +88,7 @@ public interface SerializerRegistry {
* @since 3.0
*/
default Optional<Identifier> getIdentifier(@NotNull String key) {
return getSerializers().keySet().stream()
.filter(id -> id.getKey().asString().equals(key)).findFirst();
return getSerializers().keySet().stream().filter(e -> e.toString().equals(key)).findFirst();
}
/**
@@ -99,9 +99,7 @@ public interface SerializerRegistry {
* @since 3.5.4
*/
default Optional<Serializer<Data>> getSerializer(@NotNull Identifier identifier) {
return getSerializers().entrySet().stream()
.filter(entry -> entry.getKey().getKey().equals(identifier.getKey()))
.map(Map.Entry::getValue).findFirst();
return Optional.ofNullable(getSerializers().get(identifier));
}
/**
@@ -153,14 +151,14 @@ public interface SerializerRegistry {
}
/**
* Get the set of registered data types
* Get the list of registered data types, in dependency order
*
* @return the set of registered data types
* @return the list of registered data types
* @since 3.0
*/
@NotNull
default Set<Identifier> getRegisteredDataTypes() {
return getSerializers().keySet();
default List<Identifier> getRegisteredDataTypes() {
return getSerializers().keySet().stream().sorted(DEPENDENCY_ORDER_COMPARATOR).toList();
}
// Returns if a data type is available and enabled in the config