Also added spawn eggs to 1.6.

CyclopsMC · Feb 28, 2014 · ceff08e · ceff08e
1 parent 3a7b00c
commit ceff08e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/common/evilcraft/api/config/elementtypeaction/MobAction.java b/common/evilcraft/api/config/elementtypeaction/MobAction.java
@@ -1,5 +1,7 @@
 package evilcraft.api.config.elementtypeaction;
 
+import net.minecraft.entity.EntityEggInfo;
+import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.common.registry.EntityRegistry;
@@ -38,6 +40,19 @@ public void postRun(MobConfig eConfig, Configuration config) {
         // Add I18N
         LanguageRegistry.instance().addStringLocalization("entity." + Reference.MOD_ID + ".instance." + eConfig.NAMEDID + ".name", eConfig.NAME);
         LanguageRegistry.instance().addStringLocalization("entity." + Reference.MOD_ID + "." + eConfig.NAMEDID + ".name", eConfig.NAME);
+        registerSpawnEgg(clazz, eConfig.getBackgroundEggColor(), eConfig.getForegroundEggColor());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void registerSpawnEgg(Class<? extends EntityLiving> entity, int backgroundColor, int foregroundColor) {
+        int globalEntityID = 0;
+        while (EntityList.getStringFromID(globalEntityID) != null){
+            globalEntityID++;
+        }       
+
+        EntityList.IDtoClassMapping.put(globalEntityID, entity);
+        EntityList.entityEggs.put(globalEntityID, new EntityEggInfo(globalEntityID, backgroundColor, foregroundColor));
+
     }
 
 }
diff --git a/common/evilcraft/entities/monster/NetherfishConfig.java b/common/evilcraft/entities/monster/NetherfishConfig.java
@@ -1,9 +1,10 @@
 package evilcraft.entities.monster;
 
+import net.minecraft.client.renderer.entity.Render;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.entity.Render;
 import evilcraft.Reference;
+import evilcraft.api.Helpers;
 import evilcraft.api.config.ElementTypeCategory;
 import evilcraft.api.config.MobConfig;
 import evilcraft.api.config.configurable.ConfigurableProperty;
@@ -47,12 +48,12 @@ public boolean isEnabled() {
 
     @Override
     public int getBackgroundEggColor() {
-        return 123456;
+        return Helpers.RGBToInt(73, 27, 20);
     }
 
     @Override
     public int getForegroundEggColor() {
-        return 654321;
+        return Helpers.RGBToInt(160, 45, 27);
     }
 
     @SideOnly(Side.CLIENT)

diff --git a/common/evilcraft/entities/monster/PoisonousLibelleConfig.java b/common/evilcraft/entities/monster/PoisonousLibelleConfig.java
@@ -7,6 +7,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import evilcraft.Reference;
+import evilcraft.api.Helpers;
 import evilcraft.api.config.ElementTypeCategory;
 import evilcraft.api.config.MobConfig;
 import evilcraft.api.config.configurable.ConfigurableProperty;
@@ -51,12 +52,12 @@ public boolean isEnabled() {
 
     @Override
     public int getBackgroundEggColor() {
-        return 123456;
+        return Helpers.RGBToInt(57, 125, 27);
     }
 
     @Override
     public int getForegroundEggColor() {
-        return 654321;
+        return Helpers.RGBToInt(196, 213, 57);
     }
 
     @SideOnly(Side.CLIENT)

diff --git a/common/evilcraft/entities/monster/WerewolfConfig.java b/common/evilcraft/entities/monster/WerewolfConfig.java
@@ -4,6 +4,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import evilcraft.Reference;
+import evilcraft.api.Helpers;
 import evilcraft.api.config.ElementTypeCategory;
 import evilcraft.api.config.MobConfig;
 import evilcraft.api.config.configurable.ConfigurableProperty;
@@ -48,12 +49,12 @@ public boolean isEnabled() {
 
     @Override
     public int getBackgroundEggColor() {
-        return 123456;
+        return Helpers.RGBToInt(105, 67, 18);
     }
 
     @Override
     public int getForegroundEggColor() {
-        return 654321;
+        return Helpers.RGBToInt(57, 25, 10);
     }
 
     @SideOnly(Side.CLIENT)