Skip to content

Commit 2c895e7

Browse files
committed
Revert "Registered: Add key accessor"
This reverts commit 4b802b7.
1 parent 4b0365a commit 2c895e7

File tree

4 files changed

+5
-30
lines changed

4 files changed

+5
-30
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package juuxel.adorn.lib.registry;
22

3-
import net.minecraft.registry.RegistryKey;
4-
53
import java.util.function.Supplier;
64

5+
@FunctionalInterface
76
public interface Registered<T> extends Supplier<T> {
8-
RegistryKey<? super T> key();
97
}

common/src/main/java/juuxel/adorn/lib/registry/RegisteredMap.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.function.Supplier;
1111
import java.util.stream.Stream;
1212

13-
public final class RegisteredMap<K, V> implements Supplier<Map<K, V>> {
13+
public final class RegisteredMap<K, V> implements Registered<Map<K, V>> {
1414
private final Map<K, Registered<? extends V>> map;
1515
private final Supplier<Map<K, V>> builtMap;
1616

fabric/src/main/java/juuxel/adorn/platform/fabric/RegistrarImpl.java

+2-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import juuxel.adorn.lib.registry.Registered;
55
import juuxel.adorn.lib.registry.Registrar;
66
import net.minecraft.registry.Registry;
7-
import net.minecraft.registry.RegistryKey;
87

98
import java.util.ArrayList;
109
import java.util.Iterator;
@@ -21,20 +20,9 @@ public RegistrarImpl(Registry<T> registry) {
2120

2221
@Override
2322
public <U extends T> Registered<U> register(String id, Supplier<? extends U> provider) {
24-
var key = RegistryKey.of(registry.getKey(), AdornCommon.id(id));
25-
var registered = Registry.register(registry, key, provider.get());
23+
var registered = Registry.register(registry, AdornCommon.id(id), provider.get());
2624
objects.add(registered);
27-
return new Registered<>() {
28-
@Override
29-
public U get() {
30-
return registered;
31-
}
32-
33-
@Override
34-
public RegistryKey<? super U> key() {
35-
return key;
36-
}
37-
};
25+
return () -> registered;
3826
}
3927

4028
@Override

forge/src/main/java/juuxel/adorn/platform/forge/registrar/DeferredRegistrar.java

+1-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.minecraft.registry.Registry;
77
import net.minecraft.registry.RegistryKey;
88
import net.neoforged.bus.api.IEventBus;
9-
import net.neoforged.neoforge.common.extensions.IHolderExtension;
109
import net.neoforged.neoforge.registries.DeferredHolder;
1110
import net.neoforged.neoforge.registries.DeferredRegister;
1211

@@ -32,17 +31,7 @@ public void hook(IEventBus modBus) {
3231
public <U extends T> Registered<U> register(String id, Supplier<? extends U> provider) {
3332
var registryObject = register.register(id, provider);
3433
objects.add(registryObject);
35-
return new Registered<>() {
36-
@Override
37-
public RegistryKey<? super U> key() {
38-
return ((IHolderExtension<T>) registryObject).getKey();
39-
}
40-
41-
@Override
42-
public U get() {
43-
return registryObject.get();
44-
}
45-
};
34+
return registryObject::get;
4635
}
4736

4837
@Override

0 commit comments

Comments
 (0)