diff --git a/src/main/java/mod/acgaming/spackenmobs/ModEntities.java b/src/main/java/mod/acgaming/spackenmobs/ModEntities.java deleted file mode 100644 index cd14076..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/ModEntities.java +++ /dev/null @@ -1,109 +0,0 @@ -package mod.acgaming.spackenmobs; -import java.util.ArrayList; -import java.util.List; - -import mod.acgaming.spackenmobs.entities.EntityApoRed; -import mod.acgaming.spackenmobs.entities.EntityDrachenlord; -import mod.acgaming.spackenmobs.entities.EntityIslamist; -import mod.acgaming.spackenmobs.entities.EntityJens; -import mod.acgaming.spackenmobs.entities.EntityMarcellDAvis; -import mod.acgaming.spackenmobs.entities.EntityMrBean; -import mod.acgaming.spackenmobs.entities.EntitySchalker; -import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; -import mod.acgaming.spackenmobs.render.RenderApoRed; -import mod.acgaming.spackenmobs.render.RenderDrachenlord; -import mod.acgaming.spackenmobs.render.RenderIslamist; -import mod.acgaming.spackenmobs.render.RenderJens; -import mod.acgaming.spackenmobs.render.RenderMarcellDAvis; -import mod.acgaming.spackenmobs.render.RenderMrBean; -import mod.acgaming.spackenmobs.render.RenderSchalker; -import mod.acgaming.spackenmobs.render.RenderSmavaCreeper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.monster.EntityShulker; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityPig; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.Biome.SpawnListEntry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.registry.EntityRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class ModEntities -{ - public static void init() - { - int id = 1; - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:smava_creeper"), EntitySmavaCreeper.class, "smava_creeper", id++, Spackenmobs.instance, 64, 1, true, 7649828, 11053224); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:marcell_davis"), EntityMarcellDAvis.class, "marcell_davis", id++, Spackenmobs.instance, 64, 1, true, 15759, 16777215); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:islamist"), EntityIslamist.class, "islamist", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:apored"), EntityApoRed.class, "apored", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:mr_bean"), EntityMrBean.class, "mr_bean", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:drachenlord"), EntityDrachenlord.class, "drachenlord", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:schalker"), EntitySchalker.class, "schalker", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:jens"), EntityJens.class, "jens", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); - - EntityRegistry.addSpawn(EntitySmavaCreeper.class, 25, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityCreeper.class)); - EntityRegistry.addSpawn(EntityIslamist.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityCreeper.class)); - EntityRegistry.addSpawn(EntityMarcellDAvis.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityZombie.class)); - EntityRegistry.addSpawn(EntityMrBean.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityZombie.class)); - EntityRegistry.addSpawn(EntityApoRed.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntitySkeleton.class)); - EntityRegistry.addSpawn(EntityDrachenlord.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityPigZombie.class)); - EntityRegistry.addSpawn(EntitySchalker.class, 50, 1, 4, EnumCreatureType.MONSTER, getBiomesWithMonster(EntityShulker.class)); - EntityRegistry.addSpawn(EntityJens.class, 50, 1, 4, EnumCreatureType.CREATURE, getBiomesWithCreature(EntityPig.class)); - - //LootTableList.register(EntityJens.LOOT); - } - - // Thanks to Vazkii! - public static Biome[] getBiomesWithMonster(Class clazz) - { - List biomes = new ArrayList<>(); - for (Biome b : Biome.REGISTRY) - { - List spawnList = b.getSpawnableList(EnumCreatureType.MONSTER); - for (SpawnListEntry e : spawnList) - if (e.entityClass == clazz) - { - biomes.add(b); - break; - } - } - return biomes.toArray(new Biome[0]); - } - - // Thanks to Vazkii! - public static Biome[] getBiomesWithCreature(Class clazz) - { - List biomes = new ArrayList<>(); - for (Biome b : Biome.REGISTRY) - { - List spawnList = b.getSpawnableList(EnumCreatureType.CREATURE); - for (SpawnListEntry e : spawnList) - if (e.entityClass == clazz) - { - biomes.add(b); - break; - } - } - return biomes.toArray(new Biome[0]); - } - - @SideOnly(Side.CLIENT) - public static void initModels() - { - RenderingRegistry.registerEntityRenderingHandler(EntityApoRed.class, RenderApoRed.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntityDrachenlord.class, RenderDrachenlord.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntityIslamist.class, RenderIslamist.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntityJens.class, RenderJens.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntityMarcellDAvis.class, RenderMarcellDAvis.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntityMrBean.class, RenderMrBean.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntitySchalker.class, RenderSchalker.FACTORY); - RenderingRegistry.registerEntityRenderingHandler(EntitySmavaCreeper.class, RenderSmavaCreeper.FACTORY); - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/ModItems.java b/src/main/java/mod/acgaming/spackenmobs/ModItems.java deleted file mode 100644 index 4c70f6a..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/ModItems.java +++ /dev/null @@ -1,22 +0,0 @@ -package mod.acgaming.spackenmobs; -import mod.acgaming.spackenmobs.items.ItemRAM; -import mod.acgaming.spackenmobs.items.ItemRAMOnAStick; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class ModItems -{ - @GameRegistry.ObjectHolder("spackenmobs:ram") - public static ItemRAM ram; - - @GameRegistry.ObjectHolder("spackenmobs:ram_on_a_stick") - public static ItemRAMOnAStick ram_on_a_stick; - - @SideOnly(Side.CLIENT) - public static void initModels() - { - ram.initModel(); - ram_on_a_stick.initModel(); - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java b/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java index 127857c..69b0d5e 100644 --- a/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java +++ b/src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java @@ -1,14 +1,16 @@ package mod.acgaming.spackenmobs; -import mod.acgaming.spackenmobs.proxy.CommonProxy; +import mod.acgaming.spackenmobs.entities.ModEntities; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @Mod(modid = "spackenmobs", version = "1.0", acceptedMinecraftVersions = "[1.12.2]") public class Spackenmobs @@ -16,6 +18,8 @@ public class Spackenmobs public static final String MODID = "spackenmobs"; public static final String VERSION = "1.0"; + public static final CreativeTabs SPACKENMOBS_TAB = new SpackenmobsTab(); + public static final SoundEvent ENTITY_SMAVACREEPER_FUSE = new SoundEvent(new ResourceLocation("spackenmobs:entities.smava_creeper.fuse")); public static final SoundEvent ENTITY_SMAVACREEPER_BLOW = new SoundEvent(new ResourceLocation("spackenmobs:entities.smava_creeper.blow")); public static final SoundEvent ENTITY_SMAVACREEPER_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.smava_creeper.hurt")); @@ -52,28 +56,26 @@ public class Spackenmobs public static final SoundEvent ENTITY_JENS_AMBIENT = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.ambient")); public static final SoundEvent ENTITY_JENS_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.hurt")); public static final SoundEvent ENTITY_JENS_DEATH = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.death")); - - @SidedProxy(clientSide = "mod.acgaming.spackenmobs.proxy.ClientProxy", serverSide = "mod.acgaming.spackenmobs.proxy.CommonProxy") - public static CommonProxy proxy; @Instance public static Spackenmobs instance; + @SideOnly(Side.CLIENT) @EventHandler - public void preInit(FMLPreInitializationEvent e) + public void preInit(FMLPreInitializationEvent event) { - proxy.preInit(e); + ModEntities.initModels(); } @EventHandler - public void init(FMLInitializationEvent e) + public void init(FMLInitializationEvent event) { - proxy.init(e); + } @EventHandler - public void postInit(FMLPostInitializationEvent e) + public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(e); + } } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/SpackenmobsTab.java b/src/main/java/mod/acgaming/spackenmobs/SpackenmobsTab.java new file mode 100644 index 0000000..666c6c6 --- /dev/null +++ b/src/main/java/mod/acgaming/spackenmobs/SpackenmobsTab.java @@ -0,0 +1,21 @@ +package mod.acgaming.spackenmobs; +import mod.acgaming.spackenmobs.items.ModItems; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class SpackenmobsTab extends CreativeTabs +{ + public SpackenmobsTab() + { + super(Spackenmobs.MODID); + } + + @SideOnly(Side.CLIENT) + @Override + public ItemStack getTabIconItem() + { + return new ItemStack(ModItems.RAM); + } +} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/BiomeHelper.java b/src/main/java/mod/acgaming/spackenmobs/entities/BiomeHelper.java new file mode 100644 index 0000000..78f9678 --- /dev/null +++ b/src/main/java/mod/acgaming/spackenmobs/entities/BiomeHelper.java @@ -0,0 +1,45 @@ +package mod.acgaming.spackenmobs.entities; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.Biome.SpawnListEntry; + +// Thanks to Vazkii! +public class BiomeHelper +{ + + public static Biome[] getBiomesWithMonster(Class clazz) + { + List biomes = new ArrayList<>(); + for (Biome b : Biome.REGISTRY) + { + List spawnList = b.getSpawnableList(EnumCreatureType.MONSTER); + for (SpawnListEntry e : spawnList) + if (e.entityClass == clazz) + { + biomes.add(b); + break; + } + } + return biomes.toArray(new Biome[0]); + } + + public static Biome[] getBiomesWithCreature(Class clazz) + { + List biomes = new ArrayList<>(); + for (Biome b : Biome.REGISTRY) + { + List spawnList = b.getSpawnableList(EnumCreatureType.CREATURE); + for (SpawnListEntry e : spawnList) + if (e.entityClass == clazz) + { + biomes.add(b); + break; + } + } + return biomes.toArray(new Biome[0]); + } +} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/ModEntities.java b/src/main/java/mod/acgaming/spackenmobs/entities/ModEntities.java new file mode 100644 index 0000000..136dcc7 --- /dev/null +++ b/src/main/java/mod/acgaming/spackenmobs/entities/ModEntities.java @@ -0,0 +1,25 @@ +package mod.acgaming.spackenmobs.entities; +import mod.acgaming.spackenmobs.render.RenderApoRed; +import mod.acgaming.spackenmobs.render.RenderDrachenlord; +import mod.acgaming.spackenmobs.render.RenderIslamist; +import mod.acgaming.spackenmobs.render.RenderJens; +import mod.acgaming.spackenmobs.render.RenderMarcellDAvis; +import mod.acgaming.spackenmobs.render.RenderMrBean; +import mod.acgaming.spackenmobs.render.RenderSchalker; +import mod.acgaming.spackenmobs.render.RenderSmavaCreeper; +import net.minecraftforge.fml.client.registry.RenderingRegistry; + +public class ModEntities +{ + public static void initModels() + { + RenderingRegistry.registerEntityRenderingHandler(EntityApoRed.class, RenderApoRed.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntityDrachenlord.class, RenderDrachenlord.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntityIslamist.class, RenderIslamist.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntityJens.class, RenderJens.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntityMarcellDAvis.class, RenderMarcellDAvis.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntityMrBean.class, RenderMrBean.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntitySchalker.class, RenderSchalker.FACTORY); + RenderingRegistry.registerEntityRenderingHandler(EntitySmavaCreeper.class, RenderSmavaCreeper.FACTORY); + } +} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/items/ModItems.java b/src/main/java/mod/acgaming/spackenmobs/items/ModItems.java new file mode 100644 index 0000000..3736174 --- /dev/null +++ b/src/main/java/mod/acgaming/spackenmobs/items/ModItems.java @@ -0,0 +1,11 @@ +package mod.acgaming.spackenmobs.items; +import mod.acgaming.spackenmobs.Spackenmobs; +import net.minecraft.item.Item; +import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder(Spackenmobs.MODID) +public class ModItems +{ + public static final Item RAM = null; + public static final Item RAM_ON_A_STICK = null; +} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/proxy/ClientProxy.java b/src/main/java/mod/acgaming/spackenmobs/proxy/ClientProxy.java deleted file mode 100644 index 6b8ad17..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/proxy/ClientProxy.java +++ /dev/null @@ -1,33 +0,0 @@ -package mod.acgaming.spackenmobs.proxy; -import mod.acgaming.spackenmobs.ModEntities; -import mod.acgaming.spackenmobs.ModItems; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -public class ClientProxy extends CommonProxy -{ - public void preInit(FMLPreInitializationEvent e) - { - super.preInit(e); - ModEntities.initModels(); - } - - public void init(FMLInitializationEvent e) - { - super.init(e); - } - - public void postInit(FMLPostInitializationEvent e) - { - super.postInit(e); - } - - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) - { - ModItems.initModels(); - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/reg/ModelRegHandler.java b/src/main/java/mod/acgaming/spackenmobs/reg/ModelRegHandler.java new file mode 100644 index 0000000..3a4b8d5 --- /dev/null +++ b/src/main/java/mod/acgaming/spackenmobs/reg/ModelRegHandler.java @@ -0,0 +1,26 @@ +package mod.acgaming.spackenmobs.reg; +import mod.acgaming.spackenmobs.Spackenmobs; +import mod.acgaming.spackenmobs.items.ModItems; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; + +@EventBusSubscriber(value = Side.CLIENT, modid = Spackenmobs.MODID) +public class ModelRegHandler +{ + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) + { + registerModel(ModItems.RAM, 0); + registerModel(ModItems.RAM_ON_A_STICK, 0); + } + + private static void registerModel(Item item, int meta) + { + ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory")); + } +} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/proxy/CommonProxy.java b/src/main/java/mod/acgaming/spackenmobs/reg/RegHandler.java similarity index 56% rename from src/main/java/mod/acgaming/spackenmobs/proxy/CommonProxy.java rename to src/main/java/mod/acgaming/spackenmobs/reg/RegHandler.java index f0edf5c..d1647ee 100644 --- a/src/main/java/mod/acgaming/spackenmobs/proxy/CommonProxy.java +++ b/src/main/java/mod/acgaming/spackenmobs/reg/RegHandler.java @@ -1,28 +1,86 @@ -package mod.acgaming.spackenmobs.proxy; -import mod.acgaming.spackenmobs.ModEntities; +package mod.acgaming.spackenmobs.reg; import mod.acgaming.spackenmobs.Spackenmobs; -import mod.acgaming.spackenmobs.items.ItemRAM; -import mod.acgaming.spackenmobs.items.ItemRAMOnAStick; +import mod.acgaming.spackenmobs.entities.BiomeHelper; +import mod.acgaming.spackenmobs.entities.EntityApoRed; +import mod.acgaming.spackenmobs.entities.EntityDrachenlord; +import mod.acgaming.spackenmobs.entities.EntityIslamist; +import mod.acgaming.spackenmobs.entities.EntityJens; +import mod.acgaming.spackenmobs.entities.EntityMarcellDAvis; +import mod.acgaming.spackenmobs.entities.EntityMrBean; +import mod.acgaming.spackenmobs.entities.EntitySchalker; +import mod.acgaming.spackenmobs.entities.EntitySmavaCreeper; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.entity.monster.EntityShulker; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.passive.EntityPig; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.EntityEntry; +import net.minecraftforge.fml.common.registry.EntityRegistry; -@EventBusSubscriber -public class CommonProxy -{ - public void preInit(FMLPreInitializationEvent e) +@EventBusSubscriber(modid = Spackenmobs.MODID) +public class RegHandler +{ + @SubscribeEvent + public static void registerItems(Register event) { - ModEntities.init(); + final Item[] items = { + new Item().setRegistryName(Spackenmobs.MODID, "ram").setUnlocalizedName(Spackenmobs.MODID + "." + "ram").setCreativeTab(CreativeTabs.MISC), + new Item().setRegistryName(Spackenmobs.MODID, "ram_on_a_stick").setUnlocalizedName(Spackenmobs.MODID + "." + "ram_on_a_stick").setCreativeTab(CreativeTabs.MISC) + }; + event.getRegistry().registerAll(items); } @SubscribeEvent - public static void registerSounds(RegistryEvent.Register event) + public static void registerEntities(Register event) + { + int id = 1; + + // Smava Creeper + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:smava_creeper"), EntitySmavaCreeper.class, "smava_creeper", id++, Spackenmobs.instance, 64, 1, true, 7649828, 11053224); + EntityRegistry.addSpawn(EntitySmavaCreeper.class, 25, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityCreeper.class)); + + // Marcell D'Avis + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:marcell_davis"), EntityMarcellDAvis.class, "marcell_davis", id++, Spackenmobs.instance, 64, 1, true, 15759, 16777215); + EntityRegistry.addSpawn(EntityMarcellDAvis.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityZombie.class)); + + // Islamist + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:islamist"), EntityIslamist.class, "islamist", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntityIslamist.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityCreeper.class)); + + // ApoRed + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:apored"), EntityApoRed.class, "apored", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntityApoRed.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntitySkeleton.class)); + + // Mr. Bean + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:mr_bean"), EntityMrBean.class, "mr_bean", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntityMrBean.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityZombie.class)); + + // Drachenlord + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:drachenlord"), EntityDrachenlord.class, "drachenlord", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntityDrachenlord.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityPigZombie.class)); + + // Schalker + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:schalker"), EntitySchalker.class, "schalker", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntitySchalker.class, 50, 1, 4, EnumCreatureType.MONSTER, BiomeHelper.getBiomesWithMonster(EntityShulker.class)); + + // Jens + EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:jens"), EntityJens.class, "jens", id++, Spackenmobs.instance, 64, 1, true, 15263976, 15211548); + EntityRegistry.addSpawn(EntityJens.class, 50, 1, 4, EnumCreatureType.CREATURE, BiomeHelper.getBiomesWithCreature(EntityPig.class)); + + //LootTableList.register(EntityJens.LOOT); + } + + @SubscribeEvent + public static void registerSounds(Register event) { /* * CREEPERS @@ -110,17 +168,4 @@ public class CommonProxy Spackenmobs.ENTITY_JENS_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.jens.death")); event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_JENS_DEATH); } - - public void init(FMLInitializationEvent e) {} - - public void postInit(FMLPostInitializationEvent e) {} - - @SubscribeEvent - public static void registerItems(RegistryEvent.Register event) - { - event.getRegistry().register(new ItemRAM()); - event.getRegistry().register(new ItemRAMOnAStick()); - } - - public class Events {} } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java index fe2e5dd..b741cab 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderApoRed.java @@ -10,7 +10,10 @@ import net.minecraft.client.renderer.entity.layers.LayerHeldItem; import net.minecraft.entity.monster.AbstractSkeleton; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderApoRed extends RenderSkeleton { private static final ResourceLocation APORED_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/apored.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java index 6cc2901..810ab72 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderDrachenlord.java @@ -8,7 +8,10 @@ import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderDrachenlord extends RenderZombie { private static final ResourceLocation DRACHENLORD_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/drachenlord.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java index c989857..7513531 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderIslamist.java @@ -7,7 +7,10 @@ import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderIslamist extends RenderCreeper { private static final ResourceLocation ISLAMIST_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/islamist.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java index f8bf6a1..597c31b 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderJens.java @@ -6,7 +6,10 @@ import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderJens extends RenderBiped { private static final ResourceLocation JENS_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/jens.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java index 3b2760e..610dab2 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderMarcellDAvis.java @@ -8,7 +8,10 @@ import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderMarcellDAvis extends RenderZombie { private static final ResourceLocation MARCELLDAVIS_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/marcell_davis.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java index 15ccb84..f0432d8 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderMrBean.java @@ -8,7 +8,10 @@ import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderMrBean extends RenderZombie { private static final ResourceLocation MRBEAN_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/mr_bean.png"); diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderSchalker.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderSchalker.java index 1885ad5..2cb5fbc 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderSchalker.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderSchalker.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderSchalker extends RenderLiving { public static final ResourceLocation[] SCHALKER_TEXTURE = new ResourceLocation[] {new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png"), new ResourceLocation("spackenmobs:textures/entities/schalker.png")}; diff --git a/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java b/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java index 31ed058..fd2f4de 100644 --- a/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java +++ b/src/main/java/mod/acgaming/spackenmobs/render/RenderSmavaCreeper.java @@ -7,7 +7,10 @@ import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class RenderSmavaCreeper extends RenderCreeper { private static final ResourceLocation SMAVA_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/smava_creeper.png");