diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 4a03a16ec..5d9123a9e 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -10,31 +10,32 @@ ******************************************************************************/ package forestry.core.render; -import forestry.core.config.Defaults; -import forestry.core.gadgets.TileEscritoire; -import forestry.core.interfaces.IBlockRenderer; -import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryResource; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; +import forestry.core.config.Defaults; +import forestry.core.gadgets.TileEscritoire; +import forestry.core.interfaces.IBlockRenderer; +import forestry.core.proxy.Proxies; +import forestry.core.utils.ForestryResource; + public class RenderEscritoire extends TileEntitySpecialRenderer implements IBlockRenderer { + private static final ResourceLocation texture = new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/escritoire.png"); private final ModelEscritoire modelEscritoire; - private final ResourceLocation texture = new ForestryResource(Defaults.TEXTURE_PATH_BLOCKS + "/escritoire.png"); - //private final EntityItem dummyEntityItem = new EntityItem(null); - private final RenderItem customRenderItem; public RenderEscritoire() { modelEscritoire = new ModelEscritoire(); - customRenderItem = new RenderItem() { + RenderItem customRenderItem = new RenderItem() { @Override public boolean shouldBob() { return false; diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index 2734668c6..504025ffc 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -1,7 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.storage; -import java.util.EnumSet; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,7 +23,7 @@ import forestry.plugins.PluginStorage; public class CrateRegistry implements ICrateRegistry { private void registerCrate(ItemStack stack, String uid, boolean useOreDict) { - if (!EnumSet.of(PluginManager.Stage.INIT).contains(PluginManager.getStage())) + if (PluginManager.getStage() != PluginManager.Stage.INIT) throw new RuntimeException("Tried to make a crate outside of Init"); if (stack == null || stack.getItem() == null)