Remove lag machine EntityUtils.getIdentifier

copygirl · Sep 4, 2013 · 6807868 · 6807868
1 parent 7ddc314
commit 6807868
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/src/net/mcft/copy/betterstorage/item/ItemBackpack.java b/src/net/mcft/copy/betterstorage/item/ItemBackpack.java
@@ -245,10 +245,10 @@ public static IInventory getBackpackItems(EntityLivingBase carrier) {
 	}
 
 	public static void initBackpackData(EntityLivingBase entity) {
-		EntityUtils.createProperties(entity, PropertiesBackpack.class);
+		EntityUtils.createProperties(entity, PropertiesBackpack.class, PropertiesBackpack.identifier);
 	}
 	public static PropertiesBackpack getBackpackData(EntityLivingBase entity) {
-		PropertiesBackpack backpackData = EntityUtils.getOrCreateProperties(entity, PropertiesBackpack.class);
+		PropertiesBackpack backpackData = EntityUtils.getOrCreateProperties(entity, PropertiesBackpack.class, PropertiesBackpack.identifier);
 		if (!backpackData.initialized) {
 			ItemBackpack.initBackpackOpen(entity);
 			updateHasItems(entity, backpackData);

diff --git a/src/net/mcft/copy/betterstorage/misc/PropertiesBackpack.java b/src/net/mcft/copy/betterstorage/misc/PropertiesBackpack.java
@@ -11,7 +11,6 @@ public class PropertiesBackpack implements IExtendedEntityProperties {
 
 	public static final String identifier = Constants.modId + ".backpack";
 
-	// public EntityLiving entity;
 	public ItemStack[] contents = null;
 
 	/** If the backpack has been initialized for the entity yet. */
@@ -30,7 +29,7 @@ public class PropertiesBackpack implements IExtendedEntityProperties {
 	public float prevLidAngle = 0;
 
 	@Override
-	public void init(Entity entity, World world) {}
+	public void init(Entity entity, World world) {  }
 
 	@Override
 	public void saveNBTData(NBTTagCompound compound) {

diff --git a/src/net/mcft/copy/betterstorage/proxy/CommonProxy.java b/src/net/mcft/copy/betterstorage/proxy/CommonProxy.java
@@ -233,7 +233,7 @@ public void onLivingUpdate(LivingUpdateEvent event) {
 		PropertiesBackpack backpackData;
 		if (backpack == null) {
 
-			backpackData = EntityUtils.getProperties(entity, PropertiesBackpack.class);
+			backpackData = EntityUtils.getProperties(entity, PropertiesBackpack.class, PropertiesBackpack.identifier);
 			if (backpackData == null) return;
 
 			// If the entity is supposed to spawn with

diff --git a/src/net/mcft/copy/betterstorage/utils/EntityUtils.java b/src/net/mcft/copy/betterstorage/utils/EntityUtils.java
@@ -7,28 +7,22 @@ public final class EntityUtils {
 
 	private EntityUtils() {  }
 
-	private static String getIdentifier(Class<? extends IExtendedEntityProperties> propertiesClass) {
-		try { return (String)propertiesClass.getField("identifier").get(null); }
-		catch (Exception e) { throw new RuntimeException(e); }
-	}
-
-	public static <T extends IExtendedEntityProperties> T getProperties(Entity entity, Class<T> propertiesClass) {
-		String identifier = getIdentifier(propertiesClass);
+	public static <T extends IExtendedEntityProperties> T getProperties(Entity entity, Class<T> propertiesClass, String identifier) {
 		IExtendedEntityProperties properties = entity.getExtendedProperties(identifier);
 		return (propertiesClass.isInstance(properties) ? (T)properties : null);
 	}
 
-	public static <T extends IExtendedEntityProperties> T createProperties(Entity entity, Class<T> propertiesClass) {
+	public static <T extends IExtendedEntityProperties> T createProperties(Entity entity, Class<T> propertiesClass, String identifier) {
 		try {
 			T properties = propertiesClass.getConstructor().newInstance();
-			entity.registerExtendedProperties(getIdentifier(propertiesClass), properties);
+			entity.registerExtendedProperties(identifier, properties);
 			return properties;
 		} catch (Exception e) { throw new RuntimeException(e); }
 	}
 
-	public static <T extends IExtendedEntityProperties> T getOrCreateProperties(Entity entity, Class<T> propertiesClass) {
-		T properties = getProperties(entity, propertiesClass);
-		return ((properties != null) ? properties : createProperties(entity, propertiesClass));
+	public static <T extends IExtendedEntityProperties> T getOrCreateProperties(Entity entity, Class<T> propertiesClass, String identifier) {
+		T properties = getProperties(entity, propertiesClass, identifier);
+		return ((properties != null) ? properties : createProperties(entity, propertiesClass, identifier));
 	}
 
 }