diff options
Diffstat (limited to 'src/main/java/com/anthonyhilyard/iceberg/registry')
| -rw-r--r-- | src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java | 33 | ||||
| -rw-r--r-- | src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java | 27 |
2 files changed, 31 insertions, 29 deletions
diff --git a/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java b/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java index a9b983e..59803ae 100644 --- a/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java +++ b/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java @@ -6,14 +6,13 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Supplier; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.AttributeModifierMap; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvent; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; @@ -21,7 +20,7 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.event.entity.EntityAttributeCreationEvent; /** - * Extend this class to have all registerable fields be automatically registered in Forge. Easy. + * Extend this class to have all registerable fields be automatically registered in Forge. Easy. (Just no renderers.) */ public abstract class AutoRegistry { @@ -29,7 +28,7 @@ public abstract class AutoRegistry private static boolean entityCreationRegistered = false; - private static Map<EntityType<?>, Supplier<AttributeModifierMap.MutableAttribute>> entityAttributes = new HashMap<>(); + private static Map<EntityType<?>, Supplier<AttributeSupplier.Builder>> entityAttributes = new HashMap<>(); private static Map<String, EntityType<? extends Entity>> registeredEntityTypes = new HashMap<>(); @@ -108,23 +107,11 @@ public abstract class AutoRegistry protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder) { - return registerEntity(name, builder, (Supplier<AttributeModifierMap.MutableAttribute>)null); + return registerEntity(name, builder, (Supplier<AttributeSupplier.Builder>)null); } - protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, Supplier<AttributeModifierMap.MutableAttribute> attributes) - { - return registerEntity(name, builder, null, attributes); - } - - @Deprecated - protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, IRenderFactory<? super T> renderFactory) - { - return registerEntity(name, builder, renderFactory, null); - } - - @Deprecated @SuppressWarnings("unchecked") - protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, IRenderFactory<? super T> renderFactory, Supplier<AttributeModifierMap.MutableAttribute> attributes) + protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, Supplier<AttributeSupplier.Builder> attributes) { if (MODID == null) { diff --git a/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java b/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java index e77fd1f..1b0a053 100644 --- a/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java +++ b/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java @@ -1,21 +1,36 @@ package com.anthonyhilyard.iceberg.registry; -import net.minecraft.entity.Entity; -import net.minecraftforge.fml.client.registry.IRenderFactory; -import net.minecraftforge.fml.client.registry.RenderingRegistry; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraftforge.client.event.EntityRenderersEvent; public abstract class RendererRegistrar { - protected static <T extends Entity> void registerRenderer(String name, IRenderFactory<? super T> renderFactory) + private static Map<EntityType<? extends Entity>, EntityRendererProvider<?>> entityRenderers = new HashMap<>(); + + protected static <T extends Entity> void registerRenderer(String name, EntityRendererProvider<T> rendererProvider) { if (AutoRegistry.isEntityTypeRegistered(name)) { - // Register the rendering handler. - RenderingRegistry.registerEntityRenderingHandler(AutoRegistry.<T>getEntityType(name), renderFactory); + // Store this renderer provider. + entityRenderers.put(AutoRegistry.getEntityType(name), rendererProvider); } else { throw new RuntimeException("Tried to register a renderer for an unregistered entity type! Make sure you register renderers after entities."); } } + + @SuppressWarnings({"unchecked", "unused"}) + private <T extends Entity> void onEntityCreation(EntityRenderersEvent.RegisterRenderers event) + { + for (EntityType<? extends Entity> entityType : entityRenderers.keySet()) + { + event.registerEntityRenderer((EntityType<T>)entityType, (EntityRendererProvider<T>)entityRenderers.get(entityType)); + } + } } |