Fix server startup crash

This commit is contained in:
Nick 2015-12-28 13:43:26 -08:00
parent 9ce9c66fb9
commit 42c7162f3f
5 changed files with 18 additions and 3 deletions

View file

@ -36,7 +36,6 @@ public class BloodMagic {
} }
}; };
private InventoryRenderHelper renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN);
private LogHelper logger = new LogHelper(Constants.Mod.MODID); private LogHelper logger = new LogHelper(Constants.Mod.MODID);
private File configDir; private File configDir;

View file

@ -17,8 +17,18 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
private InventoryRenderHelper renderHelper;
@Override
public InventoryRenderHelper getRenderHelper() {
return renderHelper;
}
@Override @Override
public void preInit() { public void preInit() {
renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN);
ModBlocks.initRenders(); ModBlocks.initRenders();
ModItems.initRenders(); ModItems.initRenders();

View file

@ -1,7 +1,13 @@
package WayofTime.bloodmagic.proxy; package WayofTime.bloodmagic.proxy;
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
public class CommonProxy { public class CommonProxy {
public InventoryRenderHelper getRenderHelper() {
return null;
}
public void preInit() { public void preInit() {
} }

View file

@ -62,7 +62,7 @@ public class ModBlocks {
} }
public static void initRenders() { public static void initRenders() {
InventoryRenderHelper renderHelper = BloodMagic.instance.getRenderHelper(); InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper();
renderHelper.fluidRender(lifeEssence); renderHelper.fluidRender(lifeEssence);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 0); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 0);

View file

@ -132,7 +132,7 @@ public class ModItems {
} }
public static void initRenders() { public static void initRenders() {
InventoryRenderHelper renderHelper = BloodMagic.instance.getRenderHelper(); InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper();
renderHelper.itemRenderAll(bloodOrb); renderHelper.itemRenderAll(bloodOrb);
OrbRegistry.registerOrbTexture(orbWeak, Constants.Mod.DOMAIN + "ItemBloodOrbWeak"); OrbRegistry.registerOrbTexture(orbWeak, Constants.Mod.DOMAIN + "ItemBloodOrbWeak");