New quartz hairs

gryttr · Dec 30, 2017 · 7df31d5 · 7df31d5
1 parent 5bc1349
commit 7df31d5
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 def minecraft_version = "[1.12.1,1.12.2]"
-version = "1.10a19"
+version = "1.10a20"
 group = "mod.akrivus.kagic"
 archivesBaseName = "kagic"
 

diff --git a/src/main/java/mod/akrivus/kagic/entity/gem/EntityAmethyst.java b/src/main/java/mod/akrivus/kagic/entity/gem/EntityAmethyst.java
@@ -84,7 +84,7 @@ public class EntityAmethyst extends EntityQuartzSoldier {
 
 	public static final int HAIR_COLOR_END = 0xC47DA3; 
 
-	private static final int NUM_HAIRSTYLES = 1;
+	private static final int NUM_HAIRSTYLES = 5;
 
 	private int charge_ticks = 0;
 	private int hit_count = 0;

diff --git a/src/main/java/mod/akrivus/kagic/entity/gem/EntityCarnelian.java b/src/main/java/mod/akrivus/kagic/entity/gem/EntityCarnelian.java
@@ -63,7 +63,7 @@ public class EntityCarnelian extends EntityQuartzSoldier {
 
 	public static final int SKIN_COLOR_END = 0xC5307D;
 
-	private static final int NUM_HAIRSTYLES = 1;
+	private static final int NUM_HAIRSTYLES = 5;
 
 	public static final int HAIR_COLOR_BEGIN = 0x7C0034;
 

diff --git a/src/main/java/mod/akrivus/kagic/entity/gem/EntityJasper.java b/src/main/java/mod/akrivus/kagic/entity/gem/EntityJasper.java
@@ -72,7 +72,7 @@ public class EntityJasper extends EntityQuartzSoldier {
 	private int hit_count = 0;
 	private int regenTicks = 0;
 
-	private static final int NUM_HAIRSTYLES = 1;
+	private static final int NUM_HAIRSTYLES = 5;
 	private static final Map<Integer, Integer> MARK1S = new LinkedHashMap<Integer, Integer>();
 	static {
 		MARK1S.put(0, 6);

diff --git a/src/main/resources/assets/kagic/textures/entities/amethyst/hair_1.png b/src/main/resources/assets/kagic/textures/entities/amethyst/hair_1.png
diff --git a/src/main/resources/assets/kagic/textures/entities/amethyst/hair_2.png b/src/main/resources/assets/kagic/textures/entities/amethyst/hair_2.png
diff --git a/src/main/resources/assets/kagic/textures/entities/amethyst/hair_3.png b/src/main/resources/assets/kagic/textures/entities/amethyst/hair_3.png
diff --git a/src/main/resources/assets/kagic/textures/entities/amethyst/hair_4.png b/src/main/resources/assets/kagic/textures/entities/amethyst/hair_4.png
diff --git a/src/main/resources/assets/kagic/textures/entities/carnelian/hair_1.png b/src/main/resources/assets/kagic/textures/entities/carnelian/hair_1.png
diff --git a/src/main/resources/assets/kagic/textures/entities/carnelian/hair_2.png b/src/main/resources/assets/kagic/textures/entities/carnelian/hair_2.png
diff --git a/src/main/resources/assets/kagic/textures/entities/carnelian/hair_3.png b/src/main/resources/assets/kagic/textures/entities/carnelian/hair_3.png
diff --git a/src/main/resources/assets/kagic/textures/entities/carnelian/hair_4.png b/src/main/resources/assets/kagic/textures/entities/carnelian/hair_4.png
diff --git a/src/main/resources/assets/kagic/textures/entities/jasper/hair_1.png b/src/main/resources/assets/kagic/textures/entities/jasper/hair_1.png
diff --git a/src/main/resources/assets/kagic/textures/entities/jasper/hair_2.png b/src/main/resources/assets/kagic/textures/entities/jasper/hair_2.png
diff --git a/src/main/resources/assets/kagic/textures/entities/jasper/hair_3.png b/src/main/resources/assets/kagic/textures/entities/jasper/hair_3.png
diff --git a/src/main/resources/assets/kagic/textures/entities/jasper/hair_4.png b/src/main/resources/assets/kagic/textures/entities/jasper/hair_4.png