Every compound singularity now looks unique

Spaghetti

src/main/java/singulariteam/eternalsingularity/item/CombinedSingularityItem.java

@@ -25,7 +25,10 @@ public class CombinedSingularityItem extends Item implements IHaloRenderItem, IC
 	public static final int[] types = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 , 11, 12, 13, 14, 15};
 
 	private IIcon cosmicMask;
-	private IIcon foregroundIcon;
+	@SideOnly(Side.CLIENT)
+	public IIcon[] foregroundIcons;
+	@SideOnly(Side.CLIENT)
+	public IIcon[] backgroundIcons;
 
 	private CombinedSingularityItem()
 	{
@@ -33,7 +36,7 @@ public class CombinedSingularityItem extends Item implements IHaloRenderItem, IC
 		setHasSubtypes(true);
 		setMaxDamage(0);
 		setCreativeTab(Avaritia.tab);
-		setTextureName("eternalsingularity:combined_singularity2");
+		setTextureName("eternalsingularity:combined_singularity_0");
 	}
 
 	public EnumRarity getRarity(ItemStack stack)
@@ -75,14 +78,20 @@ public class CombinedSingularityItem extends Item implements IHaloRenderItem, IC
 	public void registerIcons(IIconRegister ir)
 	{
 		super.registerIcons(ir);
+		foregroundIcons = new IIcon[types.length];
+		backgroundIcons = new IIcon[types.length];
+
+        for (int x = 0; x < types.length; x++) {
+        	foregroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + types[x] + "_overlay");
+        	backgroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + types[x]);
+        }
 		this.cosmicMask = ir.registerIcon("eternalsingularity:combined_singularity_mask");
-		this.foregroundIcon = ir.registerIcon("eternalsingularity:combined_singularity");
 	}
 
 	@Override
 	public IIcon getIcon(ItemStack stack, int pass)
 	{
-		return pass == 1 ? foregroundIcon : super.getIcon(stack, pass);
+		return pass == 1 ? this.foregroundIcons[stack.getItemDamage() % foregroundIcons.length] : this.backgroundIcons[stack.getItemDamage() % backgroundIcons.length];
 	}
 
 	@SideOnly(Side.CLIENT)

src/main/resources/assets/eternalsingularity/lang/en_US.lang

@@ -7,84 +7,95 @@
 item.eternal.singularity.name=Eternal Singularity
 //Eternal Singularity - OMG
 
-item.combined.singularity.0.name=Combined Singularity
-item.combined.singularity.1.name=Hyper Singularity
-item.combined.singularity.2.name=Nitronic Singularity
-item.combined.singularity.3.name=Scientific Singularity
-item.combined.singularity.4.name=Quadratic Singularity
-item.combined.singularity.5.name=Quantum Singularity
-item.combined.singularity.6.name=Sonic Singularity
-item.combined.singularity.7.name=Explodic Singularity
-item.combined.singularity.8.name=Supercalifragilistic Singularity
-item.combined.singularity.9.name=Idiotic Singularity
-item.combined.singularity.10.name=Ridiculous Singularity
-item.combined.singularity.11.name=Singular Singularity
-item.combined.singularity.12.name=Bionic Singularity
-item.combined.singularity.13.name=Humungous Singularity
-item.combined.singularity.14.name=Delicious Singularity
-item.combined.singularity.15.name=Baronic Singularity
-item.combined.singularity.16.name=Psychotic Singularity
-item.combined.singularity.17.name=Specific Singularity
-item.combined.singularity.18.name=Awesome Singularity
-item.combined.singularity.19.name=Gracious Singularity
-item.combined.singularity.20.name=Natural Singularity
-item.combined.singularity.21.name=Meteoric Singularity
-item.combined.singularity.22.name=Historic Singularity
-item.combined.singularity.23.name=Amazing Singularity
-item.combined.singularity.24.name=Annual Singularity
-item.combined.singularity.25.name=Pacific Singularity
-item.combined.singularity.26.name=Aromatic Singularity
-item.combined.singularity.27.name=Origamic Singularity
-item.combined.singularity.28.name=Smelly Singularity
-item.combined.singularity.29.name=Sphagettic Singularity
-item.combined.singularity.30.name=Macaronic Singularity
-item.combined.singularity.31.name=Robotic Singularity
-item.combined.singularity.32.name=Rhubarbic Singularity
-item.combined.singularity.33.name=Metric Singularity
-item.combined.singularity.34.name=Magical Singularity
-item.combined.singularity.35.name=Strategic Singularity
-item.combined.singularity.36.name=Bananular Singularity
-item.combined.singularity.37.name=Ironic Singularity
-item.combined.singularity.38.name=Fantastic Singularity
-item.combined.singularity.39.name=Archanic Singularity
-item.combined.singularity.40.name=Pneumatic Singularity
-item.combined.singularity.41.name=Electric Singularity
-item.combined.singularity.42.name=Angelic Singularity
-item.combined.singularity.43.name=Chronic Singularity
-item.combined.singularity.44.name=Chemical Singularity
-item.combined.singularity.45.name=Thermionic Singularity
-item.combined.singularity.46.name=Protonic Singularity
-item.combined.singularity.47.name=Velconic Singularity
-item.combined.singularity.48.name=Cyanic Singularity
-item.combined.singularity.49.name=Radial Singularity
-item.combined.singularity.50.name=Implodic Singularity
-item.combined.singularity.51.name=Platonic Singularity
-item.combined.singularity.52.name=Hydrolic Singularity
-item.combined.singularity.53.name=Prismatic Singularity
-item.combined.singularity.54.name=Magnetic Singularity
-item.combined.singularity.55.name=Traxonic Singularity
-item.combined.singularity.56.name=Cyclonic Singularity
-item.combined.singularity.57.name=Cubic Singularity
-item.combined.singularity.58.name=Technical Singularity
-item.combined.singularity.59.name=Astronomic Singularity
-item.combined.singularity.60.name=Flambonic Singularity
-item.combined.singularity.61.name=Gastronomic Singularity
-item.combined.singularity.62.name=Galactic Singularity
-item.combined.singularity.63.name=Cryptic Singularity
-item.combined.singularity.64.name=Analytic Singularity
-item.combined.singularity.65.name=Antique Singularity
-item.combined.singularity.66.name=Chromatic Singularity
-item.combined.singularity.67.name=Octagonal Singularity
-item.combined.singularity.68.name=Majoric Singularity
-item.combined.singularity.69.name=Terrific Singularity
-item.combined.singularity.70.name=Intrinsic Singularity
-item.combined.singularity.71.name=Celestial Singularity
-item.combined.singularity.72.name=Automatic Singularity
-item.combined.singularity.73.name=Tartaric Singularity
-item.combined.singularity.74.name=Magnificent Singularity
-item.combined.singularity.75.name=Mathematic Singularity
-item.combined.singularity.76.name= Singularity
-item.combined.singularity.77.name= Singularity
-item.combined.singularity.78.name= Singularity
-item.combined.singularity.79.name=Cosmic Singularity
-item.combined.singularity.80.name=Impossible Singularity
+item.combined.singularity.0.name=Nitronic Singularity
+item.combined.singularity.1.name= Singularity
+item.combined.singularity.2.name=Sphaghettic Singularity
+item.combined.singularity.3.name= Singularity
+item.combined.singularity.4.name= Singularity
+item.combined.singularity.5.name= Singularity
+item.combined.singularity.6.name= Singularity
+item.combined.singularity.7.name= Singularity
+item.combined.singularity.8.name= Singularity
+item.combined.singularity.9.name= Singularity
+item.combined.singularity.10.name= Singularity
+item.combined.singularity.11.name= Singularity
+item.combined.singularity.12.name= Singularity
+item.combined.singularity.13.name= Singularity
+item.combined.singularity.14.name= Singularity
+item.combined.singularity.15.name= Singularity
+
+//unused
+//Psychotic Singularity
+//Specific Singularity
+//Awesome Singularity
+//Gracious Singularity
+//Natural Singularity
+//Meteoric Singularity
+//Historic Singularity
+//Amazing Singularity
+//Annual Singularity
+//Pacific Singularity
+//Aromatic Singularity
+//Origamic Singularity
+//Smelly Singularity
+//Magnificent Singularity
+//Macaronic Singularity
+//Robotic Singularity
+//Rhubarbic Singularity
+//Metric Singularity
+//Magical Singularity
+//Strategic Singularity
+//Bananular Singularity
+//Ironic Singularity
+//Fantastic Singularity
+//Archanic Singularity
+//Pneumatic Singularity
+//Electric Singularity
+//Angelic Singularity
+//Chronic Singularity
+//Chemical Singularity
+//Thermionic Singularity
+//Protonic Singularity
+//Velconic Singularity
+//Cyanic Singularity
+//Radial Singularity
+//Implodic Singularity
+//Platonic Singularity
+//Hydrolic Singularity
+//Prismatic Singularity
+//Magnetic Singularity
+//Traxonic Singularity
+//Cyclonic Singularity
+//Cubic Singularity
+//Technical Singularity
+//Astronomic Singularity
+//Flambonic Singularity
+//Gastronomic Singularity
+//Galactic Singularity
+//Cryptic Singularity
+//Analytic Singularity
+//Antique Singularity
+//Chromatic Singularity
+//Octagonal Singularity
+//Majoric Singularity
+//Terrific Singularity
+//Intrinsic Singularity
+//Celestial Singularity
+//Automatic Singularity
+//Tartaric Singularity
+//Mathematic Singularity
+//Scientific Singularity
+//Quadratic Singularity
+//Quantum Singularity
+//Sonic Singularity
+//Explodic Singularity
+//Supercalifragilistic Singularity
+//Idiotic Singularity
+//Ridiculous Singularity
+//Singular Singularity
+//Bionic Singularity
+//Humungous Singularity
+//Delicious Singularity
+//Baronic Singularity
+//Cosmic Singularity
+//Impossible Singularity

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_1.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_10.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_10_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_11.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_11_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_12.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_12_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_13.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_13_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_14.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_14_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_15.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_15_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_1_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_2.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_2_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_3.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_3_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_4.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_4_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_5.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_5_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_6.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_6_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_7.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_7_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_8.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_8_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_9.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

src/main/resources/assets/eternalsingularity/textures/items/combined_singularity_9_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}