From 7fb6602969d7a03fc6d136397fd6ebe022f75fae Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Fri, 7 Jul 2017 16:09:23 -0400 Subject: [PATCH] move a thing so its not on fire and lowercase thingy --- .../actuallyadditions/mod/entity/InitEntities.java | 2 +- .../ellpeck/actuallyadditions/mod/entity/RenderWorm.java | 8 ++++---- .../ellpeck/actuallyadditions/mod/proxy/ClientProxy.java | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java index ea4cf68e2..418d34bce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java @@ -24,11 +24,11 @@ public final class InitEntities{ ModUtil.LOGGER.info("Initializing Entities..."); EntityRegistry.registerModEntity(new ResourceLocation(ModUtil.MOD_ID, "worm"), EntityWorm.class, ModUtil.MOD_ID+".worm", 0, ActuallyAdditions.instance, 64, 1, false); - RenderWorm.fixItemStack(); } @SideOnly(Side.CLIENT) public static void initClient(){ RenderingRegistry.registerEntityRenderingHandler(EntityWorm.class, RenderWorm.FACTORY); } + } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java index 7b749e1a3..f0e0d620e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java @@ -33,10 +33,10 @@ public class RenderWorm extends Render{ } }; - private static ItemStack STACK = ItemStack.EMPTY; + private static ItemStack stack = ItemStack.EMPTY; public static void fixItemStack(){ - STACK = new ItemStack(InitItems.itemWorm); + stack = new ItemStack(InitItems.itemWorm); } protected RenderWorm(RenderManager renderManager){ @@ -57,8 +57,8 @@ public class RenderWorm extends Render{ GlStateManager.rotate(-(float)((boop%360)), 0, 1, 0); GlStateManager.translate(0, 0, 0.4); - STACK.setStackDisplayName(entity.getName()); - AssetUtil.renderItemInWorld(STACK); + stack.setStackDisplayName(entity.getName()); + AssetUtil.renderItemInWorld(stack); GlStateManager.popMatrix(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index d0361b625..2af8de989 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -14,6 +14,7 @@ package de.ellpeck.actuallyadditions.mod.proxy; import de.ellpeck.actuallyadditions.mod.ClientRegistryHandler; import de.ellpeck.actuallyadditions.mod.blocks.render.*; import de.ellpeck.actuallyadditions.mod.entity.InitEntities; +import de.ellpeck.actuallyadditions.mod.entity.RenderWorm; import de.ellpeck.actuallyadditions.mod.event.ClientEvents; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; import de.ellpeck.actuallyadditions.mod.tile.*; @@ -55,6 +56,8 @@ public class ClientProxy implements IProxy{ public void init(FMLInitializationEvent event){ ModUtil.LOGGER.info("Initializing ClientProxy..."); + RenderWorm.fixItemStack(); + new ClientEvents(); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderCompost());