From f242b3b9e2d62cc2263e9e9288c9feb9613e8132 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Thu, 22 Aug 2019 20:51:35 -0400
Subject: Update

---
 .../jewelrycraft/util/JewelrycraftUtil.java        | 29 ++++++----------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java')

diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index 80dfdf1..cdcdd12 100755
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -1,10 +1,7 @@
 package darkknight.jewelrycraft.util;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Random;
+import java.util.*;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -106,10 +103,6 @@ public class JewelrycraftUtil {
 		}
 	}
 
-	private static boolean itemHasSubtypes(Object item) {
-		return ((Item) item).getHasSubtypes() && FMLCommonHandler.instance().getSide() == Side.CLIENT;
-	}
-
 	@SideOnly(Side.CLIENT)
 	public static void generateColors() {
 
@@ -180,17 +173,6 @@ public class JewelrycraftUtil {
 				.getIcon(0, item.getItemDamage()).getIconName().equals("soul_sand");
 	}
 
-	/*
-	 * @SideOnly(Side.CLIENT) public static int getMostCommonColour(Map map) { List
-	 * list = new LinkedList(map.entrySet()); Collections.sort(list, new
-	 * Comparator() { public int compare(Object o1, Object o2) { return
-	 * ((Comparable) ((Map.Entry) o1).getValue()) .compareTo(((Map.Entry)
-	 * o2).getValue()); } }); Map.Entry me = (Map.Entry) list.get(list.size() - 1);
-	 * for (int i = 0; i < list.size(); i++) { float alpha = Float
-	 * .valueOf(list.get(i).toString().split("=")[1]); if (alpha < 180) me =
-	 * (Map.Entry) list.get(i); } int rgb = (Integer) me.getKey(); return rgb; }
-	 */
-
 	@SideOnly(Side.CLIENT)
 	public static boolean isGray(int[] rgbArr) {
 		int rgbSum = rgbArr[0] + rgbArr[1] + rgbArr[2];
@@ -224,8 +206,13 @@ public class JewelrycraftUtil {
 	public static void addCursePoints(EntityPlayer player, int points) {
 		NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
 
-		playerInfo.setInteger("cursePoints",
-				playerInfo.hasKey("cursePoints") ? (playerInfo.getInteger("cursePoints") + points) : points);
+		int cursePoints;
+		if (playerInfo.hasKey("cursePoints"))
+			cursePoints = (playerInfo.getInteger("cursePoints") + points);
+		else
+			cursePoints = points;
+
+		playerInfo.setInteger("cursePoints", cursePoints);
 
 		playerInfo.setBoolean("playerCursePointsChanged", true);
 	}
-- 
cgit v1.2.3