From 055cce6ecede05fc823d95fda876027bce8a6567 Mon Sep 17 00:00:00 2001
From: MachineMuse <claire.alexandria@gmail.com>
Date: Fri, 12 Jul 2013 06:09:38 -0600
Subject: [PATCH] change how it's accessed to maybe eliminate instance
 weirdness

---
 .../machinemuse/powersuits/client/render/item/ArmorModel.scala  | 2 +-
 .../powersuits/client/render/item/ArmorModelInstance.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
index 2078faf..4cd4a0d 100644
--- a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
+++ b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModel.scala
@@ -11,7 +11,7 @@ import net.minecraftforge.client.model.obj.WavefrontObject
 import net.minecraft.nbt.NBTTagCompound
 
 object ArmorModel {
-  val instance: ArmorModel = ArmorModelInstance.getInstance()
+  def instance: ArmorModel = ArmorModelInstance.getInstance()
 }
 
 trait ArmorModel extends ModelBiped {
diff --git a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModelInstance.java b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModelInstance.java
index 48f8f31..9fba2f8 100644
--- a/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModelInstance.java
+++ b/src/minecraft/net/machinemuse/powersuits/client/render/item/ArmorModelInstance.java
@@ -5,7 +5,7 @@ package net.machinemuse.powersuits.client.render.item;
  * Created: 10:01 PM, 11/07/13
  */
 public class ArmorModelInstance {
-    private static ArmorModel instance;
+    private static ArmorModel instance = null;
 
     public static ArmorModel getInstance() {
         if (instance == null) {