From 28fc4a99159bc087ecc79cc782c3fc5e621714a3 Mon Sep 17 00:00:00 2001 From: Thrane Date: Tue, 7 Jun 2022 15:55:13 +0200 Subject: [PATCH] The import net.minecraftforge.fml.client cannot be resolved in class ClientProxy #1397 --- .../bassebombecraft/client/proxy/ClientProxy.java | 15 ++++++++------- .../entity/CircleProjectileEntityRenderer.java | 8 ++++---- .../entity/EggProjectileEntityRenderer.java | 8 ++++---- .../GenericCompositeProjectileEntityRenderer.java | 11 ++++++----- .../entity/LightningProjectileEntityRenderer.java | 8 ++++---- .../entity/LlamaProjectileEntityRenderer.java | 8 ++++---- .../entity/SkullProjectileEntityRenderer.java | 8 ++++---- 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/main/java/bassebombecraft/client/proxy/ClientProxy.java b/src/main/java/bassebombecraft/client/proxy/ClientProxy.java index 3ea09b91..a0c61426 100644 --- a/src/main/java/bassebombecraft/client/proxy/ClientProxy.java +++ b/src/main/java/bassebombecraft/client/proxy/ClientProxy.java @@ -13,7 +13,6 @@ import static bassebombecraft.inventory.container.RegisteredContainers.COMPOSITE_ITEM_COMTAINER; import static net.minecraft.client.gui.ScreenManager.registerFactory; import static net.minecraftforge.common.MinecraftForge.EVENT_BUS; -import static net.minecraftforge.fml.client.registry.RenderingRegistry.registerEntityRenderingHandler; import java.io.PrintWriter; import java.io.StringWriter; @@ -63,14 +62,16 @@ import bassebombecraft.event.job.JobRepository; import bassebombecraft.network.NetworkChannelHelper; import bassebombecraft.proxy.Proxy; +import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.EntityRenderersEvent; /** * Implementation of the {@linkplain Proxy} interface for the physical client. * Physical side is determined by {@linkplain Dist}. */ public class ClientProxy implements Proxy { - + /** * Meta data for block. */ @@ -317,11 +318,11 @@ public void setupClientSideRendering() throws UnsupportedOperationException { EVENT_BUS.addListener(EffectRenderer::handleRenderWorldLastEvent); // register entity rendering - registerEntityRenderingHandler(EGG_PROJECTILE.get(), EggProjectileEntityRenderer::new); - registerEntityRenderingHandler(LLAMA_PROJECTILE.get(), LlamaProjectileEntityRenderer::new); - registerEntityRenderingHandler(LIGHTNING_PROJECTILE.get(), LightningProjectileEntityRenderer::new); - registerEntityRenderingHandler(CIRCLE_PROJECTILE.get(), CircleProjectileEntityRenderer::new); - registerEntityRenderingHandler(SKULL_PROJECTILE.get(), SkullProjectileEntityRenderer::new); + EntityRenderers.register(EGG_PROJECTILE.get(), EggProjectileEntityRenderer::new); + EntityRenderers.register(LLAMA_PROJECTILE.get(), LlamaProjectileEntityRenderer::new); + EntityRenderers.register(LIGHTNING_PROJECTILE.get(), LightningProjectileEntityRenderer::new); + EntityRenderers.register(CIRCLE_PROJECTILE.get(), CircleProjectileEntityRenderer::new); + EntityRenderers.register(SKULL_PROJECTILE.get(), SkullProjectileEntityRenderer::new); // register the factory used client side to generate a screen corresponding to // the container diff --git a/src/main/java/bassebombecraft/client/rendering/entity/CircleProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/CircleProjectileEntityRenderer.java index 4493cef7..517d0bcc 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/CircleProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/CircleProjectileEntityRenderer.java @@ -3,7 +3,7 @@ import static bassebombecraft.client.rendering.RenderingUtils.createEntityTextureResourceLocation; import bassebombecraft.entity.projectile.CircleProjectileEntity; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; /** @@ -19,10 +19,10 @@ public class CircleProjectileEntityRenderer extends GenericCompositeProjectileEn /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public CircleProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); + public CircleProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); } @Override diff --git a/src/main/java/bassebombecraft/client/rendering/entity/EggProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/EggProjectileEntityRenderer.java index b40067f1..27e3a488 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/EggProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/EggProjectileEntityRenderer.java @@ -3,7 +3,7 @@ import static bassebombecraft.client.rendering.RenderingUtils.createEntityTextureResourceLocation; import bassebombecraft.entity.projectile.EggProjectileEntity; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; /** @@ -19,10 +19,10 @@ public class EggProjectileEntityRenderer extends GenericCompositeProjectileEntit /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public EggProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); + public EggProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); } @Override diff --git a/src/main/java/bassebombecraft/client/rendering/entity/GenericCompositeProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/GenericCompositeProjectileEntityRenderer.java index 1785e3cc..cbaaf09e 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/GenericCompositeProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/GenericCompositeProjectileEntityRenderer.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; @@ -33,12 +34,12 @@ public abstract class GenericCompositeProjectileEntityRenderer /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public GenericCompositeProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); - } - + public GenericCompositeProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); + } + @Override public void render(T entity, float entityYaw, float partialTicks, PoseStack matrixStackIn, MultiBufferSource bufferIn, int packedLightIn) { diff --git a/src/main/java/bassebombecraft/client/rendering/entity/LightningProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/LightningProjectileEntityRenderer.java index d8c5f506..1a480cf1 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/LightningProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/LightningProjectileEntityRenderer.java @@ -3,7 +3,7 @@ import static bassebombecraft.client.rendering.RenderingUtils.createEntityTextureResourceLocation; import bassebombecraft.entity.projectile.LightningProjectileEntity; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; /** @@ -20,10 +20,10 @@ public class LightningProjectileEntityRenderer /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public LightningProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); + public LightningProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); } @Override diff --git a/src/main/java/bassebombecraft/client/rendering/entity/LlamaProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/LlamaProjectileEntityRenderer.java index 71b7078a..63888747 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/LlamaProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/LlamaProjectileEntityRenderer.java @@ -3,7 +3,7 @@ import static bassebombecraft.client.rendering.RenderingUtils.createEntityTextureResourceLocation; import bassebombecraft.entity.projectile.LlamaProjectileEntity; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; /** @@ -19,10 +19,10 @@ public class LlamaProjectileEntityRenderer extends GenericCompositeProjectileEnt /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public LlamaProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); + public LlamaProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); } @Override diff --git a/src/main/java/bassebombecraft/client/rendering/entity/SkullProjectileEntityRenderer.java b/src/main/java/bassebombecraft/client/rendering/entity/SkullProjectileEntityRenderer.java index 6530f611..ef5934bb 100644 --- a/src/main/java/bassebombecraft/client/rendering/entity/SkullProjectileEntityRenderer.java +++ b/src/main/java/bassebombecraft/client/rendering/entity/SkullProjectileEntityRenderer.java @@ -3,7 +3,7 @@ import static bassebombecraft.client.rendering.RenderingUtils.createEntityTextureResourceLocation; import bassebombecraft.entity.projectile.SkullProjectileEntity; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; +import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; /** @@ -19,10 +19,10 @@ public class SkullProjectileEntityRenderer extends GenericCompositeProjectileEnt /** * Constructor * - * @param renderManager render manager. + * @param renderer context context. */ - public SkullProjectileEntityRenderer(EntityRenderDispatcher renderManager) { - super(renderManager); + public SkullProjectileEntityRenderer(EntityRendererProvider.Context context) { + super(context); } @Override