mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-14 11:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge issues

Browse Source
This commit is contained in:
dfsek
2021-04-11 00:53:21 -07:00
parent 88a7397bbe
commit 75cb6be36f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/dfsek/terra/registry/OpenRegistry.java
View File

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
* @param <T>
*/
public class OpenRegistry<T> implements Registry<T> {
private final Map<String, T> objects;
private final Map<String, Entry<T>> objects;
public OpenRegistry() {
objects = new HashMap<>();
@@ -29,7 +29,6 @@ public class OpenRegistry<T> implements Registry<T> {
protected OpenRegistry(Map<String, Entry<T>> init) {
this.objects = init;
}
private final Map<String, Entry<T>> objects = new HashMap<>();
@Override
public T load(Type type, Object o, ConfigLoader configLoader) throws LoadException {