diff --git a/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java b/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java index a50bb77..c92785d 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; public class ContainerExtremeCrafting extends Container { - /** The crafting matrix inventory (3x3). */ + /** The crafting matrix inventory (9x9). */ public InventoryCrafting craftMatrix = new InventoryCrafting(this, 9, 9); public IInventory craftResult = new InventoryCraftResult(); private World worldObj; diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index b54bef5..99a0b28 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -54,10 +54,6 @@ import java.util.List; public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, IGoggles, IRevealer, IVisDiscountGear, IPhantomInkable { public static final ArmorMaterial infinite_armor = EnumHelper.addArmorMaterial("infinity", 9999, new int[]{6, 16, 12, 6}, 1000); - @SideOnly(Side.CLIENT) - public static final ModelArmorInfinity armorModel = new ModelArmorInfinity(1.0f); - @SideOnly(Side.CLIENT) - public static final ModelArmorInfinity legModel = new ModelArmorInfinity(0.5f).setLegs(true); public IIcon cosmicMask; public final int slot; @@ -123,7 +119,7 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel (EntityLivingBase entityLiving, ItemStack itemstack, int armorSlot){ - ModelArmorInfinity model = armorSlot == 2 ? legModel : armorModel; + ModelArmorInfinity model = armorSlot == 2 ? ModelArmorInfinity.legModel : ModelArmorInfinity.armorModel; model.update(entityLiving, itemstack, armorSlot); diff --git a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java index fbbbba9..ab2055b 100644 --- a/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java +++ b/src/main/java/fox/spiteful/avaritia/render/LudicrousRenderEvents.java @@ -50,8 +50,8 @@ public class LudicrousRenderEvents { ModelArmorInfinity.itempagewidth = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); ModelArmorInfinity.itempageheight = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT); - ItemArmorInfinity.armorModel.rebuildOverlay(); - ItemArmorInfinity.legModel.rebuildOverlay(); + ModelArmorInfinity.armorModel.rebuildOverlay(); + ModelArmorInfinity.legModel.rebuildOverlay(); } @SubscribeEvent diff --git a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java index 08a863d..abdeeda 100644 --- a/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/render/ModelArmorInfinity.java @@ -3,6 +3,8 @@ package fox.spiteful.avaritia.render; import java.util.ArrayList; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import fox.spiteful.avaritia.Lumberjack; @@ -25,9 +27,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +@SideOnly(Side.CLIENT) public class ModelArmorInfinity extends ModelBiped { - public static IIcon overlayIcon = null; + public static final ModelArmorInfinity armorModel = new ModelArmorInfinity(1.0f); + public static final ModelArmorInfinity legModel = new ModelArmorInfinity(0.5f).setLegs(true); + + public static IIcon overlayIcon = null; public static IIcon invulnOverlayIcon = null; public static IIcon eyesIcon = null; public static IIcon wingOverlayIcon = null;