From 73c06c10ebebe8b392ade0fa6ba76ac7d9c12ee9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Jun 2016 21:18:35 -0500 Subject: [PATCH] Fix server crash --- .../vazkii/botania/client/core/proxy/ClientProxy.java | 11 +++++++++++ .../vazkii/botania/common/core/proxy/CommonProxy.java | 4 ++++ .../java/vazkii/botania/common/item/ItemGaiaHead.java | 7 ++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 3a26f6abd..03439d800 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -12,6 +12,7 @@ package vazkii.botania.client.core.proxy; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; @@ -167,6 +168,11 @@ public class ClientProxy extends CommonProxy { public static boolean jingleTheBells = false; public static boolean dootDoot = false; + private static final ModelBiped EMPTY_MODEL = new ModelBiped(); + static { + EMPTY_MODEL.setInvisible(true); + } + @Override public void preInit(FMLPreInitializationEvent event) { PersistentVariableHelper.setCacheFile(new File(Minecraft.getMinecraft().mcDataDir, "BotaniaVars.dat")); @@ -497,5 +503,10 @@ public class ClientProxy extends CommonProxy { public int getClientRenderDistance() { return Minecraft.getMinecraft().gameSettings.renderDistanceChunks; } + + @Override + public ModelBiped getEmptyModelBiped() { + return EMPTY_MODEL; + } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index d116f7e33..a1932383b 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -338,4 +338,8 @@ public class CommonProxy { return 0; } + public Object getEmptyModelBiped() { + return null; + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index eb176dcb1..6678d8386 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -37,9 +38,6 @@ import javax.annotation.Nonnull; public class ItemGaiaHead extends ItemMod { - @SideOnly(Side.CLIENT) - private static final ModelBiped EMPTY = new ModelBiped(); - public ItemGaiaHead() { super(LibItemNames.GAIA_HEAD); } @@ -53,8 +51,7 @@ public class ItemGaiaHead extends ItemMod { @Nonnull @Override public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default) { - EMPTY.setInvisible(true); - return EMPTY; + return (ModelBiped) Botania.proxy.getEmptyModelBiped(); } // Copied from vanila skull itemBlock. Relevant edits are indicated.