Skip to content

Commit 15bd9e4

Browse files
committed
use BuiltinRegistries
1 parent fc53db7 commit 15bd9e4

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/main/java/de/dertoaster/kerkercraft/common/datapack/EntityProfileDatapackRegistries.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
import java.util.Optional;
44

55
import de.dertoaster.kerkercraft.Kerkercraft;
6+
import de.dertoaster.kerkercraft.common.KCConstants;
67
import de.dertoaster.kerkercraft.common.entity.profile.EntityProfile;
78
import de.dertoaster.kerkercraft.common.entity.profile.variant.extradata.IVariantExtraData;
89
import net.commoble.databuddy.codec.RegistryDispatcher;
910
import net.minecraft.core.RegistryAccess;
11+
import net.minecraft.core.registries.BuiltInRegistries;
1012
import net.minecraft.core.registries.Registries;
1113
import net.minecraft.resources.ResourceLocation;
1214
import net.minecraft.world.entity.EntityType;
1315
import net.neoforged.fml.ModLoadingContext;
1416
import net.neoforged.fml.common.EventBusSubscriber;
1517
import net.neoforged.neoforge.registries.NeoForgeRegistries;
1618

17-
@EventBusSubscriber(modid = Kerkercraft.MODID, bus = EventBusSubscriber.Bus.MOD)
19+
@EventBusSubscriber(modid = KCConstants.MODID, bus = EventBusSubscriber.Bus.MOD)
1820
public class EntityProfileDatapackRegistries implements DatapackLoaderHelper {
1921

2022
public static final DatapackRegistry<EntityProfile> ENTITY_PROFILES = new DatapackRegistry<>(Kerkercraft.prefix("entity/profile"), EntityProfile.CODEC);
@@ -25,7 +27,7 @@ public class EntityProfileDatapackRegistries implements DatapackLoaderHelper {
2527
);
2628

2729
public static Optional<EntityProfile> getProfile(EntityType<?> entityType, RegistryAccess registryAccess) {
28-
return getProfile(Registries.ENTITY_TYPE.getKey(entityType), registryAccess);
30+
return getProfile(BuiltInRegistries.ENTITY_TYPE.getKey(entityType), registryAccess);
2931
}
3032

3133
public static void init() {

src/main/java/de/dertoaster/kerkercraft/common/entity/profile/variant/AttributeEntry.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
6-
import net.minecraft.core.Registry;
7-
import net.minecraft.core.registries.Registries;
5+
import net.minecraft.core.registries.BuiltInRegistries;
86
import net.minecraft.world.entity.ai.attributes.Attribute;
9-
import net.minecraftforge.registries.ForgeRegistries;
10-
import net.neoforged.neoforge.registries.NeoForgeRegistries;
117

128
public record AttributeEntry(
139
Attribute attribute,
1410
double value
1511
) {
1612
public static final Codec<AttributeEntry> CODEC = RecordCodecBuilder.create(instance -> {
1713
return instance.group(
18-
Registries.ATTRIBUTE.getCodec().fieldOf("id").forGetter(AttributeEntry::attribute),
14+
BuiltInRegistries.ATTRIBUTE.byNameCodec().fieldOf("id").forGetter(AttributeEntry::attribute),
1915
Codec.DOUBLE.fieldOf("value").forGetter(AttributeEntry::value)
2016
).apply(instance, AttributeEntry::new);
2117
});

0 commit comments

Comments
 (0)