diff --git a/src/main/java/net/lepidodendron/EntityRegistries.java b/src/main/java/net/lepidodendron/EntityRegistries.java index 663f1a379b..59fbaeae9a 100644 --- a/src/main/java/net/lepidodendron/EntityRegistries.java +++ b/src/main/java/net/lepidodendron/EntityRegistries.java @@ -204,7 +204,6 @@ public static void registerEntities() { registerEntity("prehistoric_flora_daedalichthys", EntityPrehistoricFloraDaedalichthys.class, LepidodendronMod.ENTITY_DAEDALICHTHYS, 48,-6056599,-5527914); registerEntity("prehistoric_flora_dakosaurus", EntityPrehistoricFloraDakosaurus.class, LepidodendronMod.ENTITY_DAKOSAURUS, 128,-13619145,-3289647); registerEntity("prehistoric_flora_dalmanites", EntityPrehistoricFloraDalmanites.class, LepidodendronMod.ENTITY_DALMANITES, 48,-5532074,-4805491); - registerEntity("prehistoric_flora_daohugoucossus", EntityPrehistoricFloraDaohugoucossus.class, LepidodendronMod.ENTITY_DAOHUGOUCOSSUS, 48,-15578831,-3422527); registerEntity("prehistoric_flora_dapedium", EntityPrehistoricFloraDapedium.class, LepidodendronMod.ENTITY_DAPEDIUM, 48,-9002852,-4615084); registerEntity("prehistoric_flora_dasyceps", EntityPrehistoricFloraDasyceps.class, LepidodendronMod.ENTITY_DASYCEPS, 64,-7376591,-13224394); registerEntity("prehistoric_flora_datheosaurus", EntityPrehistoricFloraDatheosaurus.class, LepidodendronMod.ENTITY_DATHEOSAURUS, 64, -5220563,-5885611); @@ -523,7 +522,6 @@ public static void registerEntities() { registerEntity("prehistoric_flora_palaeojelly3", EntityPrehistoricFloraJellyfish_Palaeo3.class, LepidodendronMod.ENTITY_PALAEOJELLY3, 48,-16194296,-1); registerEntity("prehistoric_flora_palaeojelly4", EntityPrehistoricFloraJellyfish_Palaeo4.class, LepidodendronMod.ENTITY_PALAEOJELLY4, 48,-2394709,-1); registerEntity("prehistoric_flora_palaeoniscum", EntityPrehistoricFloraPalaeoniscum.class, LepidodendronMod.ENTITY_PALAEONISCUM, 48,-10589093,-4866384); - registerEntity("prehistoric_flora_palaeontinid", EntityPrehistoricFloraPalaeontinid.class, LepidodendronMod.ENTITY_PALAEONTINID, 48,-12962517,-10011888); registerEntity("prehistoric_flora_panacanthocaris", EntityPrehistoricFloraPanacanthocaris.class, LepidodendronMod.ENTITY_PANACANTHOCARIS, 48,-14540261,-9808613); registerEntity("prehistoric_flora_panderichthys", EntityPrehistoricFloraPanderichthys.class, LepidodendronMod.ENTITY_PANDERICHTHYS, 64,-9020145,-3821458); registerEntity("prehistoric_flora_panderodus", EntityPrehistoricFloraPanderodus.class, LepidodendronMod.ENTITY_PANDERODUS, 48,-10940,-15303949); @@ -1391,15 +1389,10 @@ public static void registerEntities() { registerEntity("prehistoric_flora_scapanorhynchus", EntityPrehistoricFloraScapanorhynchus.class, LepidodendronMod.ENTITY_SCAPANORHYNCHUS, 84,-5465214,-85663); registerEntity("prehistoric_flora_aetosauroides", EntityPrehistoricFloraAetosauroides.class, LepidodendronMod.ENTITY_AETOSAUROIDES, 64,-10062805,-14341353); registerEntity("prehistoric_flora_taquetochelys", EntityPrehistoricFloraTaquetochelys.class, LepidodendronMod.ENTITY_TAQUETOCHELYS, 48,-12767192,-5743794); - - - // aquatic nymphs for Stonefly, Mayfly, Argentinala, Velisoptera, Damselfly - registerEntityNoEgg("prehistoric_flora_aquaticnymph", EntityPrehistoricFloraAquaticBugNymph.class, LepidodendronMod.ENTITY_AQUATIC_NYMPH, 48); - registerEntityNoEgg("prehistoric_flora_tadpole", EntityPrehistoricFloraTadpole.class, LepidodendronMod.ENTITY_TADPOLE, 48); registerEntity("prehistoric_flora_victalimulus", EntityPrehistoricFloraVictalimulus.class, LepidodendronMod.ENTITY_VICTALIMULUS, 48,-5729963,-13492456); registerEntity("prehistoric_flora_mosura", EntityPrehistoricFloraMosura.class, LepidodendronMod.ENTITY_MOSURA, 48,-1449513,-5141685); - + //v64 Sailing Across Time registerEntity("prehistoric_flora_spinosaurus", EntityPrehistoricFloraSpinosaurus.class, LepidodendronMod.ENTITY_SPINOSAURUS, 128,-3358040,-1131766); registerEntity("prehistoric_flora_irritator", EntityPrehistoricFloraIrritator.class, LepidodendronMod.ENTITY_IRRITATOR, 84,-10866141,-13914674); registerEntity("prehistoric_flora_suchomimus", EntityPrehistoricFloraSuchomimus.class, LepidodendronMod.ENTITY_SUCHOMIMUS, 84,-2371941,-14203584); @@ -1443,8 +1436,6 @@ public static void registerEntities() { registerEntity("prehistoric_flora_bananogmius", EntityPrehistoricFloraBananogmius.class, LepidodendronMod.ENTITY_BANANOGMIUS, 64,-2173062,-13858202); registerEntity("prehistoric_flora_concavotectum", EntityPrehistoricFloraConcavotectum.class, LepidodendronMod.ENTITY_CONCAVOTECTUM, 64,-3284525,-1122257); // registerEntity("prehistoric_flora_thryptodus", EntityPrehistoricFloraThryptodus.class, LepidodendronMod.ENTITY_THRYPTODUS, 48,-11354642,-15131876); - - registerEntity("prehistoric_flora_tarjadia", EntityPrehistoricFloraTarjadia.class, LepidodendronMod.ENTITY_TARJADIA, 64,-5398375,-13163237); registerEntity("prehistoric_flora_parringtonia", EntityPrehistoricFloraParringtonia.class, LepidodendronMod.ENTITY_PARRINGTONIA, 48,-13357787,-2238520); registerEntity("prehistoric_flora_dyoplax", EntityPrehistoricFloraDyoplax.class, LepidodendronMod.ENTITY_DYOPLAX, 48,-3835059,-12699338); @@ -1482,6 +1473,44 @@ public static void registerEntities() { registerEntity("prehistoric_flora_mantellisaurus", EntityPrehistoricFloraMantellisaurus.class, LepidodendronMod.ENTITY_MANTELLISAURUS, 84,-11976918,-9013202); registerEntity("prehistoric_flora_changchunsaurus", EntityPrehistoricFloraChangchunsaurus.class, LepidodendronMod.ENTITY_CHANGCHUNSAURUS, 64,-6194134,-3942616); +// registerEntity("prehistoric_flora_palaeopalaemon", EntityPrehistoricFloraPalaeopalaemon.class, LepidodendronMod.ENTITY_PALAEOPALAEMON, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_macromyzon", EntityPrehistoricFloraMacromyzon.class, LepidodendronMod.ENTITY_MACROMYZON, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_litorosuchus", EntityPrehistoricFloraLitorosuchus.class, LepidodendronMod.ENTITY_LITOROSUCHUS, 64,-11354642,-15131876); +// registerEntity("prehistoric_flora_langobardisaurus", EntityPrehistoricFloraLangobardisaurus.class, LepidodendronMod.ENTITY_LANGOBARDISAURUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_eusaurosphargis", EntityPrehistoricFloraEusaurosphargis.class, LepidodendronMod.ENTITY_EUSAUROSPHARGIS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_tremataspis", EntityPrehistoricFloraTremataspis.class, LepidodendronMod.ENTITY_TREMATASPIS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_cratosirex", EntityPrehistoricFloraCratosirex.class, LepidodendronMod.ENTITY_CRATOSIREX, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_rafaeliana", EntityPrehistoricFloraRafaeliana.class, LepidodendronMod.ENTITY_RAFAELIANA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_raptoblatta", EntityPrehistoricFloraRaptoblatta.class, LepidodendronMod.ENTITY_RAPTOBLATTA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_umenopterix", EntityPrehistoricFloraUmenopterix.class, LepidodendronMod.ENTITY_UMENOPTERIX, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_gigamachilis", EntityPrehistoricFloraGigamachilis.class, LepidodendronMod.ENTITY_GIGAMACHILIS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_archaeognatha_rocky", EntityPrehistoricFloraArchaeognatha_rocky.class, LepidodendronMod.ENTITY_ARCHAEOGNATHA_ROCKY, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_archaeognatha_jungle", EntityPrehistoricFloraArchaeognatha_jungle.class, LepidodendronMod.ENTITY_ARCHAEOGNATHA_JUNGLE, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_eoproscopia", EntityPrehistoricFloraEoproscopia.class, LepidodendronMod.ENTITY_EOPROSCOPIA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_protophasma", EntityPrehistoricFloraProtophasma.class, LepidodendronMod.ENTITY_PROTOPHASMA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_juramantophasma", EntityPrehistoricFloraJuramantophasma.class, LepidodendronMod.ENTITY_JURAMANTOPHASMA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_megalithomerus", EntityPrehistoricFloraMegalithomerus.class, LepidodendronMod.ENTITY_MEGALITHOMERUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_petropterix", EntityPrehistoricFloraPetropterix.class, LepidodendronMod.ENTITY_PETROPTERIX, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_locustopsis", EntityPrehistoricFloraLocustopsis.class, LepidodendronMod.ENTITY_LOCUSTOPSIS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_schizodactylus", EntityPrehistoricFloraSchizodactylus.class, LepidodendronMod.ENTITY_SCHIZODACTYLUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_squatina", EntityPrehistoricFloraSquatina.class, LepidodendronMod.ENTITY_SQUATINA, 64,-11354642,-15131876); +// registerEntity("prehistoric_flora_axelrodichthys", EntityPrehistoricFloraAxelrodichthys.class, LepidodendronMod.ENTITY_AXELRODICHTHYS, 84,-11354642,-15131876); +// registerEntity("prehistoric_flora_abyssosaurus", EntityPrehistoricFloraAbyssosaurus.class, LepidodendronMod.ENTITY_ABYSSOSAURUS, 128,-11354642,-15131876); +// registerEntity("prehistoric_flora_phuwiangvenator", EntityPrehistoricFloraPhuwiangvenator.class, LepidodendronMod.ENTITY_PHUWIANGVENATOR, 84,-11354642,-15131876); +// registerEntity("prehistoric_flora_neovenator", EntityPrehistoricFloraNeovenator.class, LepidodendronMod.ENTITY_NEOVENATOR, 84,-11354642,-15131876); +// registerEntity("prehistoric_flora_iberobatrachus", EntityPrehistoricFloraIberobatrachus.class, LepidodendronMod.ENTITY_IBEROBATRACHUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_liaobatrachus", EntityPrehistoricFloraLiaobatrachus.class, LepidodendronMod.ENTITY_LIAOBATRACHUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_varanosuchus", EntityPrehistoricFloraVaranosuchus.class, LepidodendronMod.ENTITY_VARANOSUCHUS, 64,-11354642,-15131876); +// registerEntity("prehistoric_flora_susisuchus", EntityPrehistoricFloraSusisuchus.class, LepidodendronMod.ENTITY_SUSISUCHUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_bernissartia", EntityPrehistoricFloraBernissartia.class, LepidodendronMod.ENTITY_BERNISSARTIA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_montsecosuchus", EntityPrehistoricFloraMontsecosuchus.class, LepidodendronMod.ENTITY_MONTSECOSUCHUS, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_isisfordia", EntityPrehistoricFloraIsisfordia.class, LepidodendronMod.ENTITY_ISISFORDIA, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_spinolestes", EntityPrehistoricFloraSpinolestes.class, LepidodendronMod.ENTITY_SPINOLESTES, 48,-11354642,-15131876); +// registerEntity("prehistoric_flora_velociraptor", EntityPrehistoricFloraVelociraptor.class, LepidodendronMod.ENTITY_VELOCIRAPTOR, 84,-11354642,-15131876); +// registerEntity("prehistoric_flora_pholidosaurus", EntityPrehistoricFloraPholidosaurus.class, LepidodendronMod.ENTITY_PHOLIDOSAURUS, 84,-11354642,-15131876); + registerEntityNoEgg("prehistoric_flora_palaeontinid", EntityPrehistoricFloraPalaeontinid.class, LepidodendronMod.ENTITY_PALAEONTINID, 48); + + registerEntity("prehistoric_flora_ectenaspis", EntityPrehistoricFloraEctenaspis.class, LepidodendronMod.ENTITY_ECTENASPIS, 48,-3762114,-13195478); @@ -1518,6 +1547,11 @@ public static void registerEntities() { registerEntity("prehistoric_flora_umoonasaurus", EntityPrehistoricFloraUmoonasaurus.class, LepidodendronMod.ENTITY_UMOONASAURUS, 48,-12570834,-6210547); + + // aquatic nymphs for Stonefly, Mayfly, Argentinala, Velisoptera, Damselfly + registerEntityNoEgg("prehistoric_flora_aquaticnymph", EntityPrehistoricFloraAquaticBugNymph.class, LepidodendronMod.ENTITY_AQUATIC_NYMPH, 48); + registerEntityNoEgg("prehistoric_flora_tadpole", EntityPrehistoricFloraTadpole.class, LepidodendronMod.ENTITY_TADPOLE, 48); + registerEntityNoEgg("prehistoric_flora_boat", EntityPNBoat.class, LepidodendronMod.ENTITY_BOAT, 80); registerEntityNoEgg("prehistoric_flora_submarine", PrehistoricFloraSubmarine.class, LepidodendronMod.ENTITY_SUBMARINE, 80); registerEntityNoEgg("prehistoric_flora_raft", EntityRaft.class, LepidodendronMod.ENTITY_RAFT, 80); diff --git a/src/main/java/net/lepidodendron/LepidodendronBookSubscribers.java b/src/main/java/net/lepidodendron/LepidodendronBookSubscribers.java index 3cc0e75f7f..63e8a3671e 100644 --- a/src/main/java/net/lepidodendron/LepidodendronBookSubscribers.java +++ b/src/main/java/net/lepidodendron/LepidodendronBookSubscribers.java @@ -2075,15 +2075,6 @@ else if (entityClicked instanceof EntityPrehistoricFloraPalaeoisopus) { event.setCanceled(true); return; } - else if (entityClicked instanceof EntityPrehistoricFloraPalaeontinid) { - if ((event.getEntityPlayer() instanceof EntityPlayerMP)) { - ModTriggers.CLICK_PALAEONTINID.trigger((EntityPlayerMP) event.getEntityPlayer()); - } - event.getEntityPlayer().swingArm(event.getHand()); - deliverStatsEntity(event); - event.setCanceled(true); - return; - } else if (entityClicked instanceof EntityPrehistoricFloraPanderodus) { if ((event.getEntityPlayer() instanceof EntityPlayerMP)) { ModTriggers.CLICK_PANDERODUS.trigger((EntityPlayerMP) event.getEntityPlayer()); @@ -5481,15 +5472,6 @@ else if (entityClicked instanceof EntityPrehistoricFloraCoccoderma) { event.setCanceled(true); return; } - else if (entityClicked instanceof EntityPrehistoricFloraDaohugoucossus) { - if ((event.getEntityPlayer() instanceof EntityPlayerMP)) { - ModTriggers.CLICK_DAOHUGOUCOSSUS.trigger((EntityPlayerMP) event.getEntityPlayer()); - } - event.getEntityPlayer().swingArm(event.getHand()); - deliverStatsEntity(event); - event.setCanceled(true); - return; - } else if (entityClicked instanceof EntityPrehistoricFloraTrachymetopon) { if ((event.getEntityPlayer() instanceof EntityPlayerMP)) { ModTriggers.CLICK_TRACHYMETOPON.trigger((EntityPlayerMP) event.getEntityPlayer()); diff --git a/src/main/java/net/lepidodendron/LepidodendronMod.java b/src/main/java/net/lepidodendron/LepidodendronMod.java index d5659965c0..b3ab182557 100644 --- a/src/main/java/net/lepidodendron/LepidodendronMod.java +++ b/src/main/java/net/lepidodendron/LepidodendronMod.java @@ -918,6 +918,16 @@ public class LepidodendronMod { public static final ResourceLocation PROTOZYGOPTERA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/protozygoptera")); public static final int ENTITY_PALAEONTINID = 349; public static final ResourceLocation PALAEONTINID_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid")); + public static final ResourceLocation PALAEONTINID_AUSTROPROSBOLOIDES_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_austroprosboloides")); + public static final ResourceLocation PALAEONTINID_FLETCHERIANA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_fletcheriana")); + public static final ResourceLocation PALAEONTINID_PAPILIONTINA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_papiliontina")); + public static final ResourceLocation PALAEONTINID_EOCICADA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_eocicada")); + public static final ResourceLocation PALAEONTINID_TALBRAGAROCOSSUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_talbragarocossus")); + public static final ResourceLocation PALAEONTINID_MIRACOSSUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_miracossus")); + public static final ResourceLocation PALAEONTINID_ILERDOCOSSUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_ilerdocossus")); + public static final ResourceLocation PALAEONTINID_BAEOCOSSUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_baeocossus")); + public static final ResourceLocation PALAEONTINID_COLOSSOCOSSUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_colossocossus")); + public static final ResourceLocation PALAEONTINID_PACHYPSYCHE_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeontinid_pachypsyche")); public static final int ENTITY_CASINERIA = 350; public static final ResourceLocation CASINERIA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/casineria")); public static final ResourceLocation CASINERIA_LOOT_YOUNG = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/casineria_young")); diff --git a/src/main/java/net/lepidodendron/LepidodendronSorter.java b/src/main/java/net/lepidodendron/LepidodendronSorter.java index 799f8ae5ca..3740ec976d 100644 --- a/src/main/java/net/lepidodendron/LepidodendronSorter.java +++ b/src/main/java/net/lepidodendron/LepidodendronSorter.java @@ -6416,6 +6416,16 @@ public class LepidodendronSorter { public static final int kostensuchus_raw = 5958; public static final int epoidesuchus_raw = 5959; public static final int eggs_epoidesuchus = 5960; + public static final int austroprosboloides_raw = 5961; + public static final int fletcheriana_raw = 5962; + public static final int talbragarocossus_raw = 5963; + public static final int eocicada_raw = 5964; + public static final int papiliontina_raw = 5965; + public static final int ilerdocossus_raw = 5966; + public static final int miracossus_raw = 5967; + public static final int baeocossus_raw = 5968; + public static final int colossocossus_raw = 5969; + public static final int pachypsyche_raw = 5970; public static final int bivalve_toucasia = 6000; public static final int coeloptychium = 6001; diff --git a/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraDaohugoucossus.java b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraDaohugoucossus.java index 13a9afae18..26df58fa75 100644 --- a/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraDaohugoucossus.java +++ b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraDaohugoucossus.java @@ -1,262 +1,262 @@ - -package net.lepidodendron.entity; - -import net.ilexiconn.llibrary.client.model.tools.ChainBuffer; -import net.ilexiconn.llibrary.server.animation.Animation; -import net.lepidodendron.LepidodendronMod; -import net.lepidodendron.block.BlockGlassJar; -import net.lepidodendron.entity.ai.DietString; -import net.lepidodendron.entity.base.EntityPrehistoricFloraInsectFlyingBase; -import net.lepidodendron.entity.render.entity.RenderDaohugoucossus; -import net.lepidodendron.entity.render.tile.RenderDisplays; -import net.lepidodendron.entity.util.ITrappableAir; -import net.lepidodendron.util.EggLayingConditions; -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.properties.PropertyDirection; -import net.minecraft.client.model.ModelBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootTable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.ArrayUtils; - -import javax.annotation.Nullable; - -public class EntityPrehistoricFloraDaohugoucossus extends EntityPrehistoricFloraInsectFlyingBase implements ITrappableAir { - - public BlockPos currentTarget; - @SideOnly(Side.CLIENT) - public ChainBuffer chainBuffer; - private int animationTick; - private Animation animation = NO_ANIMATION; - - public EntityPrehistoricFloraDaohugoucossus(World world) { - super(world); - setSize(0.3F, 0.2F); - } - - @Override - public int getEggType(@Nullable String variantIn) { - return 20; //insect - } - - @Override - public String[] getFoodOreDicts() { - return ArrayUtils.addAll(DietString.PLANTS); - } - - @Override - public boolean canJar() { - return true; - } - - @Override - public int sitTickCtMax() { - return 2400; - } - - @Override - public int sitCooldownSetter() { - return 500 + rand.nextInt(1000); - } - - @Override - public ResourceLocation FlightSound() { - return new ResourceLocation("lepidodendron:bug_flight"); - } - - public static String getPeriod() {return "Jurassic";} - - //public static String getHabitat() {return "Terrestrial";} - - @Override - public boolean dropsEggs() { - return false; - } - - @Override - public boolean laysEggs() { - return true; - } - - @Override - public int getAnimationTick() { - return animationTick; - } - - @Override - public void setAnimationTick(int tick) - { - animationTick = tick; - } - - @Override - public Animation getAnimation() - { - return this.animation; - } - - @Override - public void setAnimation(Animation animation) - { - if (animation == NO_ANIMATION){ - onAnimationFinish(this.animation); - setAnimationTick(0); - } - this.animation = animation; - } - - @Override - public Animation[] getAnimations() - { - return null; - } - - protected void onAnimationFinish(Animation animation) - {} - - @Override - protected float getAISpeedInsect() { - if (this.getTicks() < 0) { - return 0.0F; //Is laying eggs - } - return 2.76f; - } - - @Override - public boolean isAIDisabled() { - return false; - } - - @Override - public boolean laysInBlock() { - return true; - } - - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2.0D); - this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25D); - } - - @Override - public String getTexture() { - return this.getTexture(); - } - - @Override - public SoundEvent getAmbientSound() { - return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("")); - } - - @Override - public SoundEvent getHurtSound(DamageSource ds) { - return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.hurt")); - } - - @Override - public SoundEvent getDeathSound() { - return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.death")); - } - - @Override - protected float getSoundVolume() { - return 1.0F; - } - - @Nullable - protected ResourceLocation getLootTable() { return LepidodendronMod.BUG_LOOT;} - - @Override - protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) - { - if (source == BlockGlassJar.BlockCustom.FREEZE) { - //System.err.println("Jar loot!"); - ResourceLocation resourcelocation = LepidodendronMod.DAOHUGOUCOSSUS_LOOT; - LootTable loottable = this.world.getLootTableManager().getLootTableFromLocation(resourcelocation); - LootContext.Builder lootcontext$builder = (new LootContext.Builder((WorldServer)this.world)).withLootedEntity(this).withDamageSource(source); - for (ItemStack itemstack : loottable.generateLootForPools(this.rand, lootcontext$builder.build())) - { - this.entityDropItem(itemstack, 0.0F); - } - } - else { - super.dropLoot(wasRecentlyHit, lootingModifier, source); - } - - } - - public static final PropertyDirection FACING = BlockDirectional.FACING; - - @Override - public boolean testLay(World world, BlockPos pos) { - return EggLayingConditions.testLayMossAndWoodInsectFlying(this, world, pos); - } - - //Rendering taxidermy: - //-------------------- - public static double offsetCase(@Nullable String variant) { - return 0.295F; - } - public static double offsetCaseMagnified(@Nullable String variant) { return 1.16; } - public static double offsetWall(@Nullable String variant) { - return 0.0; - } - public static double upperfrontverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double upperbackverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double upperfrontlineoffset(@Nullable String variant) { - return 0.0; - } - public static double upperfrontlineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double upperbacklineoffset(@Nullable String variant) { - return 0.0; - } - public static double upperbacklineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double lowerfrontverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double lowerbackverticallinedepth(@Nullable String variant) { - return 0.25; - } - public static double lowerfrontlineoffset(@Nullable String variant) { - return 0.0; - } - public static double lowerfrontlineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double lowerbacklineoffset(@Nullable String variant) { - return 0.0; - } - public static double lowerbacklineoffsetperpendiular(@Nullable String variant) { - return -0.0; - } - @SideOnly(Side.CLIENT) - public static ResourceLocation textureDisplay(@Nullable String variant) {return RenderDaohugoucossus.TEXTURE;} - @SideOnly(Side.CLIENT) - public static ModelBase modelDisplay(@Nullable String variant) {return RenderDisplays.modelDaohugoucossus;} - public static float getScaler(@Nullable String variant) { - return RenderDaohugoucossus.getScaler(); - } - public static float widthSupport(@Nullable String variant) {return 0.012F;} - public static float getScalerMagnified(@Nullable String variant) { - return RenderDaohugoucossus.getScaler() * 4.0F; - } - -} \ No newline at end of file +// +//package net.lepidodendron.entity; +// +//import net.ilexiconn.llibrary.client.model.tools.ChainBuffer; +//import net.ilexiconn.llibrary.server.animation.Animation; +//import net.lepidodendron.LepidodendronMod; +//import net.lepidodendron.block.BlockGlassJar; +//import net.lepidodendron.entity.ai.DietString; +//import net.lepidodendron.entity.base.EntityPrehistoricFloraInsectFlyingBase; +//import net.lepidodendron.entity.render.entity.RenderDaohugoucossus; +//import net.lepidodendron.entity.render.tile.RenderDisplays; +//import net.lepidodendron.entity.util.ITrappableAir; +//import net.lepidodendron.util.EggLayingConditions; +//import net.minecraft.block.BlockDirectional; +//import net.minecraft.block.properties.PropertyDirection; +//import net.minecraft.client.model.ModelBase; +//import net.minecraft.entity.SharedMonsterAttributes; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.DamageSource; +//import net.minecraft.util.ResourceLocation; +//import net.minecraft.util.SoundEvent; +//import net.minecraft.util.math.BlockPos; +//import net.minecraft.world.World; +//import net.minecraft.world.WorldServer; +//import net.minecraft.world.storage.loot.LootContext; +//import net.minecraft.world.storage.loot.LootTable; +//import net.minecraftforge.fml.relauncher.Side; +//import net.minecraftforge.fml.relauncher.SideOnly; +//import org.apache.commons.lang3.ArrayUtils; +// +//import javax.annotation.Nullable; +// +//public class EntityPrehistoricFloraDaohugoucossus extends EntityPrehistoricFloraInsectFlyingBase implements ITrappableAir { +// +// public BlockPos currentTarget; +// @SideOnly(Side.CLIENT) +// public ChainBuffer chainBuffer; +// private int animationTick; +// private Animation animation = NO_ANIMATION; +// +// public EntityPrehistoricFloraDaohugoucossus(World world) { +// super(world); +// setSize(0.3F, 0.2F); +// } +// +// @Override +// public int getEggType(@Nullable String variantIn) { +// return 20; //insect +// } +// +// @Override +// public String[] getFoodOreDicts() { +// return ArrayUtils.addAll(DietString.PLANTS); +// } +// +// @Override +// public boolean canJar() { +// return true; +// } +// +// @Override +// public int sitTickCtMax() { +// return 2400; +// } +// +// @Override +// public int sitCooldownSetter() { +// return 500 + rand.nextInt(1000); +// } +// +// @Override +// public ResourceLocation FlightSound() { +// return new ResourceLocation("lepidodendron:bug_flight"); +// } +// +// public static String getPeriod() {return "Jurassic";} +// +// //public static String getHabitat() {return "Terrestrial";} +// +// @Override +// public boolean dropsEggs() { +// return false; +// } +// +// @Override +// public boolean laysEggs() { +// return true; +// } +// +// @Override +// public int getAnimationTick() { +// return animationTick; +// } +// +// @Override +// public void setAnimationTick(int tick) +// { +// animationTick = tick; +// } +// +// @Override +// public Animation getAnimation() +// { +// return this.animation; +// } +// +// @Override +// public void setAnimation(Animation animation) +// { +// if (animation == NO_ANIMATION){ +// onAnimationFinish(this.animation); +// setAnimationTick(0); +// } +// this.animation = animation; +// } +// +// @Override +// public Animation[] getAnimations() +// { +// return null; +// } +// +// protected void onAnimationFinish(Animation animation) +// {} +// +// @Override +// protected float getAISpeedInsect() { +// if (this.getTicks() < 0) { +// return 0.0F; //Is laying eggs +// } +// return 2.76f; +// } +// +// @Override +// public boolean isAIDisabled() { +// return false; +// } +// +// @Override +// public boolean laysInBlock() { +// return true; +// } +// +// @Override +// protected void applyEntityAttributes() { +// super.applyEntityAttributes(); +// this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2.0D); +// this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25D); +// } +// +// @Override +// public String getTexture() { +// return this.getTexture(); +// } +// +// @Override +// public SoundEvent getAmbientSound() { +// return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("")); +// } +// +// @Override +// public SoundEvent getHurtSound(DamageSource ds) { +// return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.hurt")); +// } +// +// @Override +// public SoundEvent getDeathSound() { +// return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.death")); +// } +// +// @Override +// protected float getSoundVolume() { +// return 1.0F; +// } +// +// @Nullable +// protected ResourceLocation getLootTable() { return LepidodendronMod.BUG_LOOT;} +// +// @Override +// protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) +// { +// if (source == BlockGlassJar.BlockCustom.FREEZE) { +// //System.err.println("Jar loot!"); +// ResourceLocation resourcelocation = LepidodendronMod.DAOHUGOUCOSSUS_LOOT; +// LootTable loottable = this.world.getLootTableManager().getLootTableFromLocation(resourcelocation); +// LootContext.Builder lootcontext$builder = (new LootContext.Builder((WorldServer)this.world)).withLootedEntity(this).withDamageSource(source); +// for (ItemStack itemstack : loottable.generateLootForPools(this.rand, lootcontext$builder.build())) +// { +// this.entityDropItem(itemstack, 0.0F); +// } +// } +// else { +// super.dropLoot(wasRecentlyHit, lootingModifier, source); +// } +// +// } +// +// public static final PropertyDirection FACING = BlockDirectional.FACING; +// +// @Override +// public boolean testLay(World world, BlockPos pos) { +// return EggLayingConditions.testLayMossAndWoodInsectFlying(this, world, pos); +// } +// +// //Rendering taxidermy: +// //-------------------- +// public static double offsetCase(@Nullable String variant) { +// return 0.295F; +// } +// public static double offsetCaseMagnified(@Nullable String variant) { return 1.16; } +// public static double offsetWall(@Nullable String variant) { +// return 0.0; +// } +// public static double upperfrontverticallinedepth(@Nullable String variant) { +// return 0.0; +// } +// public static double upperbackverticallinedepth(@Nullable String variant) { +// return 0.0; +// } +// public static double upperfrontlineoffset(@Nullable String variant) { +// return 0.0; +// } +// public static double upperfrontlineoffsetperpendiular(@Nullable String variant) { +// return 0.0; +// } +// public static double upperbacklineoffset(@Nullable String variant) { +// return 0.0; +// } +// public static double upperbacklineoffsetperpendiular(@Nullable String variant) { +// return 0.0; +// } +// public static double lowerfrontverticallinedepth(@Nullable String variant) { +// return 0.0; +// } +// public static double lowerbackverticallinedepth(@Nullable String variant) { +// return 0.25; +// } +// public static double lowerfrontlineoffset(@Nullable String variant) { +// return 0.0; +// } +// public static double lowerfrontlineoffsetperpendiular(@Nullable String variant) { +// return 0.0; +// } +// public static double lowerbacklineoffset(@Nullable String variant) { +// return 0.0; +// } +// public static double lowerbacklineoffsetperpendiular(@Nullable String variant) { +// return -0.0; +// } +// @SideOnly(Side.CLIENT) +// public static ResourceLocation textureDisplay(@Nullable String variant) {return RenderDaohugoucossus.TEXTURE;} +// @SideOnly(Side.CLIENT) +// public static ModelBase modelDisplay(@Nullable String variant) {return RenderDisplays.modelDaohugoucossus;} +// public static float getScaler(@Nullable String variant) { +// return RenderDaohugoucossus.getScaler(); +// } +// public static float widthSupport(@Nullable String variant) {return 0.012F;} +// public static float getScalerMagnified(@Nullable String variant) { +// return RenderDaohugoucossus.getScaler() * 4.0F; +// } +// +//} \ No newline at end of file diff --git a/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinid.java b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinid.java index da7c314d6e..ac7e7c2c66 100644 --- a/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinid.java +++ b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinid.java @@ -1,26 +1,34 @@ package net.lepidodendron.entity; -import net.ilexiconn.llibrary.client.model.tools.ChainBuffer; import net.ilexiconn.llibrary.server.animation.Animation; import net.lepidodendron.LepidodendronMod; import net.lepidodendron.block.BlockGlassJar; +import net.lepidodendron.block.base.IAdvancementGranter; import net.lepidodendron.entity.ai.DietString; import net.lepidodendron.entity.base.EntityPrehistoricFloraInsectFlyingBase; import net.lepidodendron.entity.render.entity.RenderPalaeontinid; import net.lepidodendron.entity.render.tile.RenderDisplays; -import net.lepidodendron.entity.util.ITrappableWater; +import net.lepidodendron.entity.util.ITrappableAir; import net.lepidodendron.item.entities.ItemUnknownEggLand; -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.properties.PropertyDirection; +import net.lepidodendron.item.entities.spawneggs.*; +import net.lepidodendron.util.CustomTrigger; +import net.lepidodendron.util.ModTriggers; import net.minecraft.client.model.ModelBase; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.loot.LootContext; @@ -32,62 +40,648 @@ import javax.annotation.Nullable; -public class EntityPrehistoricFloraPalaeontinid extends EntityPrehistoricFloraInsectFlyingBase implements ITrappableWater { +public class EntityPrehistoricFloraPalaeontinid extends EntityPrehistoricFloraInsectFlyingBase implements ITrappableAir, IAdvancementGranter { - public BlockPos currentTarget; - @SideOnly(Side.CLIENT) - public ChainBuffer chainBuffer; private int animationTick; private Animation animation = NO_ANIMATION; + private static final float[] AUSTROPROSBOLOIDES_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] FLETCHERIANA_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] PAPILIONTINA_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] EOCICADA_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] TALBRAGAROCOSSUS_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] MIRACOSSUS_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] ILERDOCOSSUS_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] BAEOCOSSUS_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] COLOSSOCOSSUS_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] PACHYPSYCHE_SIZE = new float[]{0.2F, 0.2F}; + private static final float[] DAOHUGOUCOSSUS_SIZE = new float[]{0.2F, 0.2F}; + + private static final DataParameter INSECT_TYPE = EntityDataManager.createKey(EntityPrehistoricFloraPalaeontinid.class, DataSerializers.VARINT); + public EntityPrehistoricFloraPalaeontinid(World world) { super(world); - setSize(0.3F, 0.2F); + + //***************************************************** + //Insect variant managers: + + setSize(getHitBoxSize()[0], getHitBoxSize()[1]); } @Override - public boolean canJar() { + public byte breedPNVariantsMatch() { + return 1; + } + + @Override + public boolean canMateWith(EntityAnimal otherAnimal) + { + if (otherAnimal == this) + { + return false; + } + else if (otherAnimal.getClass() != this.getClass()) + { + return false; + } + else { + switch (this.breedPNVariantsMatch()) { + case 0: default: + break; + + case -1: + if (((EntityPrehistoricFloraPalaeontinid)otherAnimal).getPNType() == this.getPNType()) { + return false; + } + break; + + case 1: + if (((EntityPrehistoricFloraPalaeontinid)otherAnimal).getPNType() != this.getPNType()) { + return false; + } + break; + + } + } + + return this.isInLove() && otherAnimal.isInLove(); + } + + @Override + public ItemStack getPickedResult(RayTraceResult target) + { + if (target.entityHit instanceof EntityPrehistoricFloraPalaeontinid) { + EntityPrehistoricFloraPalaeontinid Palaeontinid = (EntityPrehistoricFloraPalaeontinid) target.entityHit; + switch (Palaeontinid.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return new ItemStack(ItemSpawnEggPalaeontinidAustroprosboloides.block, 1); + + case FLETCHERIANA: + return new ItemStack(ItemSpawnEggPalaeontinidFletcheriana.block, 1); + + case PAPILIONTINA: + return new ItemStack(ItemSpawnEggPalaeontinidPapiliontina.block, 1); + + case EOCICADA: + return new ItemStack(ItemSpawnEggPalaeontinidEocicada.block, 1); + + case TALBRAGAROCOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidTalbragarocossus.block, 1); + + case MIRACOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidMiracossus.block, 1); + + case ILERDOCOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidIlerdocossus.block, 1); + + case BAEOCOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidBaeocossus.block, 1); + + case COLOSSOCOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidColossocossus.block, 1); + + case PACHYPSYCHE: + return new ItemStack(ItemSpawnEggPalaeontinidPachypsyche.block, 1); + + case DAOHUGOUCOSSUS: + return new ItemStack(ItemSpawnEggPalaeontinidDaohugoucossus.block, 1); + + } + } + return ItemStack.EMPTY; + } + + @Nullable + @Override + public CustomTrigger getModTrigger() { + switch (this.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return ModTriggers.CLICK_AUSTROPROSBOLOIDES; + case FLETCHERIANA: + return ModTriggers.CLICK_FLETCHERIANA; + case PAPILIONTINA: + return ModTriggers.CLICK_PAPILIONTINA; + case EOCICADA: + return ModTriggers.CLICK_EOCICADA; + case TALBRAGAROCOSSUS: + return ModTriggers.CLICK_TALBRAGAROCOSSUS; + case MIRACOSSUS: + return ModTriggers.CLICK_MIRACOSSUS; + case ILERDOCOSSUS: + return ModTriggers.CLICK_ILERDOCOSSUS; + case BAEOCOSSUS: + return ModTriggers.CLICK_BAEOCOSSUS; + case COLOSSOCOSSUS: + return ModTriggers.CLICK_COLOSSOCOSSUS; + case PACHYPSYCHE: + return ModTriggers.CLICK_PACHYPSYCHE; + case DAOHUGOUCOSSUS: + return ModTriggers.CLICK_DAOHUGOUCOSSUS; + + } + } + + @Override + public boolean hasPNVariants() { return true; } @Override - public int sitTickCtMax() { - return 2400; + public String getPNTypeName() + { + return this.getPNType().getName(); + } + + public enum Type + { + AUSTROPROSBOLOIDES(1, "austroprosboloides"), + FLETCHERIANA(2, "fletcheriana"), + PAPILIONTINA(3, "papiliontina"), + EOCICADA(4, "eocicada"), + TALBRAGAROCOSSUS(5, "talbragarocossus"), + MIRACOSSUS(6, "miracossus"), + ILERDOCOSSUS(7, "ilerdocossus"), + BAEOCOSSUS(8, "baeocossus"), + COLOSSOCOSSUS(9, "colossocossus"), + PACHYPSYCHE(10, "pachypsyche"), + DAOHUGOUCOSSUS(11, "daohugoucossus") + ; + + private final String name; + private final int metadata; + + Type(int metadataIn, String nameIn) + { + this.name = nameIn; + this.metadata = metadataIn; + } + + public String getName() + { + return this.name; + } + + public int getMetadata() + { + return this.metadata; + } + + public String toString() + { + return this.name; + } + + public static Type byId(int id) + { + if (id < 0 || id >= values().length) + { + id = 0; + } + + return values()[id]; + } + + public static Type getTypeFromString(String nameIn) + { + for (int i = 0; i < values().length; ++i) + { + if (values()[i].getName().equals(nameIn)) + { + return values()[i]; + } + } + + return values()[0]; + } + + } + + public ResourceLocation getFreezeLoot() { + switch (this.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return LepidodendronMod.PALAEONTINID_AUSTROPROSBOLOIDES_LOOT; + + case FLETCHERIANA: + return LepidodendronMod.PALAEONTINID_FLETCHERIANA_LOOT; + + case PAPILIONTINA: + return LepidodendronMod.PALAEONTINID_PAPILIONTINA_LOOT; + + case EOCICADA: + return LepidodendronMod.PALAEONTINID_EOCICADA_LOOT; + + case TALBRAGAROCOSSUS: + return LepidodendronMod.PALAEONTINID_TALBRAGAROCOSSUS_LOOT; + + case MIRACOSSUS: + return LepidodendronMod.PALAEONTINID_MIRACOSSUS_LOOT; + + case ILERDOCOSSUS: + return LepidodendronMod.PALAEONTINID_ILERDOCOSSUS_LOOT; + + case BAEOCOSSUS: + return LepidodendronMod.PALAEONTINID_BAEOCOSSUS_LOOT; + + case COLOSSOCOSSUS: + return LepidodendronMod.PALAEONTINID_COLOSSOCOSSUS_LOOT; + + case PACHYPSYCHE: + return LepidodendronMod.PALAEONTINID_PACHYPSYCHE_LOOT; + + case DAOHUGOUCOSSUS: + return LepidodendronMod.DAOHUGOUCOSSUS_LOOT; + + } + } + + public ResourceLocation getStandardLoot() { + return LepidodendronMod.BUG_LOOT; + } + + public float getFlySpeed() { + switch (this.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return 3f; + + case FLETCHERIANA: + return 3f; + + case PAPILIONTINA: + return 3f; + + case EOCICADA: + return 3f; + + case TALBRAGAROCOSSUS: + return 3f; + + case MIRACOSSUS: + return 3f; + + case ILERDOCOSSUS: + return 3f; + + case BAEOCOSSUS: + return 3f; + + case COLOSSOCOSSUS: + return 3f; + + case PACHYPSYCHE: + return 3f; + + case DAOHUGOUCOSSUS: + return 3f; + + } + } + + public float[] getHitBoxSize() { + switch (this.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return AUSTROPROSBOLOIDES_SIZE; + + case FLETCHERIANA: + return FLETCHERIANA_SIZE; + + case PAPILIONTINA: + return PAPILIONTINA_SIZE; + + case EOCICADA: + return EOCICADA_SIZE; + + case TALBRAGAROCOSSUS: + return TALBRAGAROCOSSUS_SIZE; + + case MIRACOSSUS: + return MIRACOSSUS_SIZE; + + case ILERDOCOSSUS: + return ILERDOCOSSUS_SIZE; + + case BAEOCOSSUS: + return BAEOCOSSUS_SIZE; + + case COLOSSOCOSSUS: + return COLOSSOCOSSUS_SIZE; + + case PACHYPSYCHE: + return PACHYPSYCHE_SIZE; + + case DAOHUGOUCOSSUS: + return DAOHUGOUCOSSUS_SIZE; + } + } + + @Nullable + protected ResourceLocation getLootTable() { + return getStandardLoot(); + } + + //Rendering taxidermy: + //-------------------- + public static double offsetCaseMagnified(@Nullable String variant) { return -0.21; } + public static double offsetCase(@Nullable String variant) { + switch (EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)) { + case AUSTROPROSBOLOIDES: default: + return 0.0; + + case FLETCHERIANA: + return 0.0; + + case PAPILIONTINA: + return 0.0; + + case EOCICADA: + return 0.0; + + case TALBRAGAROCOSSUS: + return 0.0; + + case MIRACOSSUS: + return 0.0; + + case ILERDOCOSSUS: + return 0.0; + + case BAEOCOSSUS: + return 0.0; + + case COLOSSOCOSSUS: + return 0.0; + + case PACHYPSYCHE: + return 0.0; + + case DAOHUGOUCOSSUS: + return 0.0; + } + } + + public static double offsetWall(@Nullable String variant) { + switch (EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)) { + case AUSTROPROSBOLOIDES: default: + return 0.0; + + case FLETCHERIANA: + return 0.0; + + case PAPILIONTINA: + return 0.0; + + case EOCICADA: + return 0.0; + + case TALBRAGAROCOSSUS: + return 0.0; + + case MIRACOSSUS: + return 0.0; + + case ILERDOCOSSUS: + return 0.0; + + case BAEOCOSSUS: + return 0.0; + + case COLOSSOCOSSUS: + return 0.0; + + case PACHYPSYCHE: + return 0.0; + + case DAOHUGOUCOSSUS: + return 0.0; + } + } + + public static double upperfrontverticallinedepth(@Nullable String variant) { + return 0.0; + } + public static double upperbackverticallinedepth(@Nullable String variant) { + return 0.75; + } + public static double upperfrontlineoffset(@Nullable String variant) { + return 0.0; + } + public static double upperfrontlineoffsetperpendiular(@Nullable String variant) { + return -0F; + } + public static double upperbacklineoffset(@Nullable String variant) { + return 0.0; + } + public static double upperbacklineoffsetperpendiular(@Nullable String variant) { + return 0.0F; + } + public static double lowerfrontverticallinedepth(@Nullable String variant) { + return 0; + } + public static double lowerbackverticallinedepth(@Nullable String variant) { + return 0.6; + } + public static double lowerfrontlineoffset(@Nullable String variant) { + return 0; + } + public static double lowerfrontlineoffsetperpendiular(@Nullable String variant) { + return 0.0F; + } + public static double lowerbacklineoffset(@Nullable String variant) { + return -0.0; + } + public static double lowerbacklineoffsetperpendiular(@Nullable String variant) { + return 0F; + } + + @SideOnly(Side.CLIENT) + public static ResourceLocation textureDisplay(@Nullable String variant) { + switch (EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)) { + case AUSTROPROSBOLOIDES: + default: + return RenderPalaeontinid.TEXTURE_AUSTROPROSBOLOIDES; + + case FLETCHERIANA: + return RenderPalaeontinid.TEXTURE_FLETCHERIANA; + + case PAPILIONTINA: + return RenderPalaeontinid.TEXTURE_PAPILIONTINA; + + case EOCICADA: + return RenderPalaeontinid.TEXTURE_EOCICADA; + + case TALBRAGAROCOSSUS: + return RenderPalaeontinid.TEXTURE_TALBRAGAROCOSSUS; + + case MIRACOSSUS: + return RenderPalaeontinid.TEXTURE_MIRACOSSUS; + + case ILERDOCOSSUS: + return RenderPalaeontinid.TEXTURE_COLOSSOCOSSUS; + + case BAEOCOSSUS: + return RenderPalaeontinid.TEXTURE_ILERDOCOSSUS; + + case COLOSSOCOSSUS: + return RenderPalaeontinid.TEXTURE_BAEOCOSSUS; + + case PACHYPSYCHE: + return RenderPalaeontinid.TEXTURE_PACHYPSYCHE; + + case DAOHUGOUCOSSUS: + return RenderPalaeontinid.TEXTURE_DAOHUGOUCOSSUS; + } + } + @SideOnly(Side.CLIENT) + public static ModelBase modelDisplay(@Nullable String variant) { + switch (EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)) { + case AUSTROPROSBOLOIDES: + default: + return RenderDisplays.modelPalaeontinid; + + case FLETCHERIANA: + return RenderDisplays.modelPalaeontinid; + + case PAPILIONTINA: + return RenderDisplays.modelPalaeontinid; + + case EOCICADA: + return RenderDisplays.modelPalaeontinid; + + case TALBRAGAROCOSSUS: + return RenderDisplays.modelPalaeontinid; + + case MIRACOSSUS: + return RenderDisplays.modelPalaeontinid; + + case ILERDOCOSSUS: + return RenderDisplays.modelKrika; + + case BAEOCOSSUS: + return RenderDisplays.modelNuddsia; + + case COLOSSOCOSSUS: + return RenderDisplays.modelKarenina; + + case PACHYPSYCHE: + return RenderDisplays.modelKarenina; + + case DAOHUGOUCOSSUS: + return RenderDisplays.modelKarenina; + } + } + + public static float getScaler(@Nullable String variant) { + return RenderPalaeontinid.getScaler(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)); + } + + public static float getScalerMagnified(@Nullable String variant) { + return RenderPalaeontinid.getScaler(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(variant)) * 3.0F; + } + + + + @Override + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + { + if (source == BlockGlassJar.BlockCustom.FREEZE) { + ResourceLocation resourcelocation = getFreezeLoot(); + LootTable loottable = this.world.getLootTableManager().getLootTableFromLocation(resourcelocation); + LootContext.Builder lootcontext$builder = (new LootContext.Builder((WorldServer)this.world)).withLootedEntity(this).withDamageSource(source); + for (ItemStack itemstack : loottable.generateLootForPools(this.rand, lootcontext$builder.build())) + { + NBTTagCompound variantNBT = new NBTTagCompound(); + variantNBT.setString("PNType", this.getPNType().getName()); + String stringEgg = EntityRegistry.getEntry(this.getClass()).getRegistryName().toString(); + variantNBT.setString("PNDisplaycase", stringEgg); + itemstack.setTagCompound(variantNBT); + this.entityDropItem(itemstack, 0.0F); + } + } + else { + super.dropLoot(wasRecentlyHit, lootingModifier, source); + } + } + + @Override + protected void entityInit() { + super.entityInit(); + this.dataManager.register(INSECT_TYPE, 0); } @Override - public int sitCooldownSetter() { - return 500 + rand.nextInt(1000); + public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, @Nullable IEntityLivingData livingdata) { + livingdata = super.onInitialSpawn(difficulty, livingdata); + this.setPNType(Type.byId(rand.nextInt(Type.values().length) + 1)); + return livingdata; } @Override - public ResourceLocation FlightSound() { - return new ResourceLocation("lepidodendron:bug_flight"); + public String getName() { + if (this.hasCustomName()) + { + return this.getCustomNameTag(); + } + else + { + return I18n.translateToLocal("entity.prehistoric_flora_palaeontinid_" + this.getPNType().getName() + ".name"); + } } - public static String getPeriod() {return "Permian - Triassic - Jurassic - Early Cretaceous - Late Cretaceous";} + public void writeEntityToNBT(NBTTagCompound compound) { + super.writeEntityToNBT(compound); + compound.setString("PNType", this.getPNType().getName()); + } - //public static String getHabitat() {return "Terrestrial";} + public void readEntityFromNBT(NBTTagCompound compound) { + if (this.world != null) { + super.readEntityFromNBT(compound); + } + if (compound.hasKey("PNType", 8)) + { + this.setPNType(Type.getTypeFromString(compound.getString("PNType"))); + } + } + + public void setPNType(Type type) + { + this.dataManager.set(INSECT_TYPE, Integer.valueOf(type.ordinal())); + } + + public Type getPNType() + { + return Type.byId(((Integer)this.dataManager.get(INSECT_TYPE)).intValue()); + } + + //***************************************************** @Override - public boolean dropsEggs() { + public boolean canJar() { return true; } + public static String getPeriod() {return "Permian - Triassic - Jurassic - Early Cretaceous";} + + //public static String getHabitat() {return "Terrestrial";} + @Override - public boolean laysEggs() { - return false; + public boolean dropsEggs() { + return true; } @Override public ItemStack getDroppedEggItemStack() { ItemStack stack = new ItemStack(ItemUnknownEggLand.block, (int) (1)); NBTTagCompound variantNBT = new NBTTagCompound(); - variantNBT.setString("creature", "lepidodendron:prehistoric_flora_palaeontinid"); + variantNBT.setString("PNType", this.getPNType().getName()); + variantNBT.setString("creature", "lepidodendron:prehistoric_fora_palaeontinid"); stack.setTagCompound(variantNBT); return stack; } + @Override + public boolean laysEggs() { + return false; + } + @Override public int getAnimationTick() { return animationTick; @@ -129,7 +723,10 @@ protected float getAISpeedInsect() { if (this.getTicks() < 0) { return 0.0F; //Is laying eggs } - return 2.76f; + if (this.flyProgress == 0 || this.getAttachmentPos() != null) { + return 0.0f; + } + return getFlySpeed(); } @Override @@ -137,11 +734,6 @@ public boolean isAIDisabled() { return false; } - @Override - public boolean laysInBlock() { - return true; - } - @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); @@ -174,95 +766,14 @@ protected float getSoundVolume() { return 1.0F; } - @Nullable - protected ResourceLocation getLootTable() { return LepidodendronMod.BUG_LOOT;} - @Override - protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) - { - if (source == BlockGlassJar.BlockCustom.FREEZE) { - //System.err.println("Jar loot!"); - ResourceLocation resourcelocation = LepidodendronMod.PALAEONTINID_LOOT; - LootTable loottable = this.world.getLootTableManager().getLootTableFromLocation(resourcelocation); - LootContext.Builder lootcontext$builder = (new LootContext.Builder((WorldServer)this.world)).withLootedEntity(this).withDamageSource(source); - for (ItemStack itemstack : loottable.generateLootForPools(this.rand, lootcontext$builder.build())) - { - NBTTagCompound variantNBT = new NBTTagCompound(); - variantNBT.setString("PNType", ""); - String stringEgg = EntityRegistry.getEntry(this.getClass()).getRegistryName().toString(); - variantNBT.setString("PNDisplaycase", stringEgg); - itemstack.setTagCompound(variantNBT); - this.entityDropItem(itemstack, 0.0F); - } - } - else { - super.dropLoot(wasRecentlyHit, lootingModifier, source); - } - + public ResourceLocation FlightSound() { + return new ResourceLocation("lepidodendron:bug_flight"); } - public static final PropertyDirection FACING = BlockDirectional.FACING; - @Override public String[] getFoodOreDicts() { - return ArrayUtils.addAll(DietString.PLANTS); + return ArrayUtils.addAll(DietString.BUG); } - //Rendering taxidermy: - //-------------------- - public static double offsetCase(@Nullable String variant) { - return 0.32F; - } - public static double offsetCaseMagnified(@Nullable String variant) { return 1.01; } - public static double offsetWall(@Nullable String variant) { - return 0.0; - } - public static double upperfrontverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double upperbackverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double upperfrontlineoffset(@Nullable String variant) { - return 0.0; - } - public static double upperfrontlineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double upperbacklineoffset(@Nullable String variant) { - return 0.0; - } - public static double upperbacklineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double lowerfrontverticallinedepth(@Nullable String variant) { - return 0.0; - } - public static double lowerbackverticallinedepth(@Nullable String variant) { - return 0.25; - } - public static double lowerfrontlineoffset(@Nullable String variant) { - return 0.0; - } - public static double lowerfrontlineoffsetperpendiular(@Nullable String variant) { - return 0.0; - } - public static double lowerbacklineoffset(@Nullable String variant) { - return 0.0; - } - public static double lowerbacklineoffsetperpendiular(@Nullable String variant) { - return -0.0; - } - @SideOnly(Side.CLIENT) - public static ResourceLocation textureDisplay(@Nullable String variant) {return RenderPalaeontinid.TEXTURE;} - @SideOnly(Side.CLIENT) - public static ModelBase modelDisplay(@Nullable String variant) {return RenderDisplays.modelPalaeontinid;} - public static float getScaler(@Nullable String variant) { - return RenderPalaeontinid.getScaler(); - } - public static float widthSupport(@Nullable String variant) {return 0.012F;} - public static float getScalerMagnified(@Nullable String variant) { - return RenderPalaeontinid.getScaler() * 3.5F; - } - } \ No newline at end of file diff --git a/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinoid.java b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinoid.java new file mode 100644 index 0000000000..067a48cc18 --- /dev/null +++ b/src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraPalaeontinoid.java @@ -0,0 +1,258 @@ + +package net.lepidodendron.entity; + +import net.ilexiconn.llibrary.client.model.tools.ChainBuffer; +import net.ilexiconn.llibrary.server.animation.Animation; +import net.lepidodendron.LepidodendronMod; +import net.lepidodendron.block.BlockGlassJar; +import net.lepidodendron.entity.ai.DietString; +import net.lepidodendron.entity.base.EntityPrehistoricFloraInsectFlyingBase; +import net.lepidodendron.entity.render.entity.RenderPalaeontinid; +import net.lepidodendron.entity.render.tile.RenderDisplays; +import net.lepidodendron.entity.util.ITrappableWater; +import net.lepidodendron.item.entities.ItemUnknownEggLand; +import net.minecraft.block.BlockDirectional; +import net.minecraft.block.properties.PropertyDirection; +import net.minecraft.client.model.ModelBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.LootTable; +import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.ArrayUtils; + +import javax.annotation.Nullable; + +public class EntityPrehistoricFloraPalaeontinoid extends EntityPrehistoricFloraInsectFlyingBase implements ITrappableWater { + + public BlockPos currentTarget; + @SideOnly(Side.CLIENT) + public ChainBuffer chainBuffer; + private int animationTick; + private Animation animation = NO_ANIMATION; + + public EntityPrehistoricFloraPalaeontinoid(World world) { + super(world); + setSize(0.3F, 0.2F); + } + + @Override + public boolean canJar() { + return true; + } + + @Override + public int sitTickCtMax() { + return 2400; + } + + @Override + public int sitCooldownSetter() { + return 500 + rand.nextInt(1000); + } + + @Override + public ResourceLocation FlightSound() { + return new ResourceLocation("lepidodendron:bug_flight"); + } + + public static String getPeriod() {return "Permian - Triassic - Jurassic - Early Cretaceous - Late Cretaceous";} + + //public static String getHabitat() {return "Terrestrial";} + + @Override + public boolean dropsEggs() { + return true; + } + + @Override + public boolean laysEggs() { + return false; + } + + @Override + public ItemStack getDroppedEggItemStack() { + ItemStack stack = new ItemStack(ItemUnknownEggLand.block, (int) (1)); + NBTTagCompound variantNBT = new NBTTagCompound(); + variantNBT.setString("creature", "lepidodendron:prehistoric_flora_palaeontinid"); + stack.setTagCompound(variantNBT); + return stack; + } + + @Override + public int getAnimationTick() { + return animationTick; + } + + @Override + public void setAnimationTick(int tick) + { + animationTick = tick; + } + + @Override + public Animation getAnimation() + { + return this.animation; + } + + @Override + public void setAnimation(Animation animation) + { + if (animation == NO_ANIMATION){ + onAnimationFinish(this.animation); + setAnimationTick(0); + } + this.animation = animation; + } + + @Override + public Animation[] getAnimations() + { + return null; + } + + protected void onAnimationFinish(Animation animation) + {} + + @Override + protected float getAISpeedInsect() { + if (this.getTicks() < 0) { + return 0.0F; //Is laying eggs + } + return 2.76f; + } + + @Override + public boolean isAIDisabled() { + return false; + } + + @Override + public boolean laysInBlock() { + return true; + } + + @Override + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2.0D); + this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.25D); + } + + @Override + public String getTexture() { + return this.getTexture(); + } + + @Override + public SoundEvent getAmbientSound() { + return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("")); + } + + @Override + public SoundEvent getHurtSound(DamageSource ds) { + return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.hurt")); + } + + @Override + public SoundEvent getDeathSound() { + return (SoundEvent) SoundEvent.REGISTRY.getObject(new ResourceLocation("entity.generic.death")); + } + + @Override + protected float getSoundVolume() { + return 1.0F; + } + + @Nullable + protected ResourceLocation getLootTable() { return LepidodendronMod.BUG_LOOT;} + + @Override + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + { + if (source == BlockGlassJar.BlockCustom.FREEZE) { + //System.err.println("Jar loot!"); + ResourceLocation resourcelocation = LepidodendronMod.PALAEONTINID_LOOT; + LootTable loottable = this.world.getLootTableManager().getLootTableFromLocation(resourcelocation); + LootContext.Builder lootcontext$builder = (new LootContext.Builder((WorldServer)this.world)).withLootedEntity(this).withDamageSource(source); + for (ItemStack itemstack : loottable.generateLootForPools(this.rand, lootcontext$builder.build())) + { + NBTTagCompound variantNBT = new NBTTagCompound(); + variantNBT.setString("PNType", ""); + String stringEgg = EntityRegistry.getEntry(this.getClass()).getRegistryName().toString(); + variantNBT.setString("PNDisplaycase", stringEgg); + itemstack.setTagCompound(variantNBT); + this.entityDropItem(itemstack, 0.0F); + } + } + else { + super.dropLoot(wasRecentlyHit, lootingModifier, source); + } + + } + + public static final PropertyDirection FACING = BlockDirectional.FACING; + + @Override + public String[] getFoodOreDicts() { + return ArrayUtils.addAll(DietString.PLANTS); + } + + //Rendering taxidermy: + //-------------------- + public static double offsetCase(@Nullable String variant) { + return 0.32F; + } + public static double offsetCaseMagnified(@Nullable String variant) { return 1.01; } + public static double offsetWall(@Nullable String variant) { + return 0.0; + } + public static double upperfrontverticallinedepth(@Nullable String variant) { + return 0.0; + } + public static double upperbackverticallinedepth(@Nullable String variant) { + return 0.0; + } + public static double upperfrontlineoffset(@Nullable String variant) { + return 0.0; + } + public static double upperfrontlineoffsetperpendiular(@Nullable String variant) { + return 0.0; + } + public static double upperbacklineoffset(@Nullable String variant) { + return 0.0; + } + public static double upperbacklineoffsetperpendiular(@Nullable String variant) { + return 0.0; + } + public static double lowerfrontverticallinedepth(@Nullable String variant) { + return 0.0; + } + public static double lowerbackverticallinedepth(@Nullable String variant) { + return 0.25; + } + public static double lowerfrontlineoffset(@Nullable String variant) { + return 0.0; + } + public static double lowerfrontlineoffsetperpendiular(@Nullable String variant) { + return 0.0; + } + public static double lowerbacklineoffset(@Nullable String variant) { + return 0.0; + } + public static double lowerbacklineoffsetperpendiular(@Nullable String variant) { + return -0.0; + } + + +} \ No newline at end of file diff --git a/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinid.java b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinid.java index a672724d05..4fb835e26b 100644 --- a/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinid.java +++ b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinid.java @@ -1,103 +1,112 @@ package net.lepidodendron.entity.model.entity; import net.ilexiconn.llibrary.client.model.tools.AdvancedModelRenderer; -import net.lepidodendron.entity.base.EntityPrehistoricFloraInsectFlyingBase; +import net.lepidodendron.entity.EntityPrehistoricFloraLacewing; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; import net.lepidodendron.entity.model.ModelBasePalaeopedia; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; public class ModelPalaeontinid extends ModelBasePalaeopedia { private final AdvancedModelRenderer body; + private final AdvancedModelRenderer body2; private final AdvancedModelRenderer mouthpart; - private final AdvancedModelRenderer legL1; - private final AdvancedModelRenderer legR1; - private final AdvancedModelRenderer legR2; - private final AdvancedModelRenderer legR3; - private final AdvancedModelRenderer legL2; - private final AdvancedModelRenderer legL3; - private final AdvancedModelRenderer forewingR; - private final AdvancedModelRenderer forewingL; - private final AdvancedModelRenderer hindwingL; - private final AdvancedModelRenderer hindwingR; + private final AdvancedModelRenderer legright; + private final AdvancedModelRenderer legleft; + private final AdvancedModelRenderer legright2; + private final AdvancedModelRenderer legleft2; + private final AdvancedModelRenderer legright3; + private final AdvancedModelRenderer legleft3; + private final AdvancedModelRenderer forewingright; + private final AdvancedModelRenderer forewingleft; + private final AdvancedModelRenderer hindwingright; + private final AdvancedModelRenderer hindwingleft; public ModelPalaeontinid() { - this.textureWidth = 64; - this.textureHeight = 64; + this.textureWidth = 24; + this.textureHeight = 24; this.body = new AdvancedModelRenderer(this); this.body.setRotationPoint(0.0F, 22.5F, 0.0F); - this.body.cubeList.add(new ModelBox(body, 0, 12, -2.0F, -2.0F, -4.0F, 4, 2, 5, 0.0F, false)); - this.body.cubeList.add(new ModelBox(body, 16, 17, -1.5F, -2.0F, 1.0F, 3, 2, 2, 0.0F, false)); - this.body.cubeList.add(new ModelBox(body, 0, 0, -1.0F, -1.5F, 3.0F, 2, 1, 1, 0.0F, false)); - this.body.cubeList.add(new ModelBox(body, 0, 14, 1.5F, -1.75F, -3.5F, 1, 1, 1, 0.0F, false)); - this.body.cubeList.add(new ModelBox(body, 0, 19, -2.5F, -1.75F, -3.5F, 1, 1, 1, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 0, 9, -1.5F, -2.0F, -3.0F, 3, 2, 2, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 6, 13, -1.0F, -1.45F, -3.5F, 2, 1, 1, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 10, 15, -0.5F, -1.45F, -3.5F, 1, 1, 1, 0.01F, false)); + + this.body2 = new AdvancedModelRenderer(this); + this.body2.setRotationPoint(0.0F, -1.9F, -1.0F); + this.body.addChild(body2); + this.setRotateAngle(body2, -0.0873F, 0.0F, 0.0F); + this.body2.cubeList.add(new ModelBox(body2, 10, 9, -1.5F, 0.0F, 0.0F, 3, 2, 2, -0.01F, false)); + this.body2.cubeList.add(new ModelBox(body2, 0, 13, -1.0F, 0.5F, 1.975F, 2, 1, 1, 0.0F, false)); this.mouthpart = new AdvancedModelRenderer(this); this.mouthpart.setRotationPoint(0.0F, 0.0F, -3.5F); this.body.addChild(mouthpart); this.setRotateAngle(mouthpart, 1.2654F, 0.0F, 0.0F); - this.mouthpart.cubeList.add(new ModelBox(mouthpart, 4, 1, 0.0F, 0.0F, 0.0F, 0, 2, 1, 0.0F, false)); - - this.legL1 = new AdvancedModelRenderer(this); - this.legL1.setRotationPoint(2.0F, 0.0F, -2.0F); - this.body.addChild(legL1); - this.setRotateAngle(legL1, 0.0F, 0.5236F, 0.0F); - this.legL1.cubeList.add(new ModelBox(legL1, 0, 12, -0.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.legR1 = new AdvancedModelRenderer(this); - this.legR1.setRotationPoint(-2.0F, 0.0F, -2.0F); - this.body.addChild(legR1); - this.setRotateAngle(legR1, 0.0F, -0.5236F, 0.0F); - this.legR1.cubeList.add(new ModelBox(legR1, 0, 6, -1.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.legR2 = new AdvancedModelRenderer(this); - this.legR2.setRotationPoint(-2.0F, 0.0F, -1.25F); - this.body.addChild(legR2); - this.legR2.cubeList.add(new ModelBox(legR2, 0, 4, -1.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.legR3 = new AdvancedModelRenderer(this); - this.legR3.setRotationPoint(-2.0F, 0.0F, -0.5F); - this.body.addChild(legR3); - this.setRotateAngle(legR3, 0.0F, 0.5236F, 0.0F); - this.legR3.cubeList.add(new ModelBox(legR3, 0, 2, -1.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.legL2 = new AdvancedModelRenderer(this); - this.legL2.setRotationPoint(2.0F, 0.0F, -1.25F); - this.body.addChild(legL2); - this.legL2.cubeList.add(new ModelBox(legL2, 0, 10, -0.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.legL3 = new AdvancedModelRenderer(this); - this.legL3.setRotationPoint(2.0F, 0.0F, -0.5F); - this.body.addChild(legL3); - this.setRotateAngle(legL3, 0.0F, -0.5236F, 0.0F); - this.legL3.cubeList.add(new ModelBox(legL3, 0, 8, -0.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); - - this.forewingR = new AdvancedModelRenderer(this); - this.forewingR.setRotationPoint(-2.0F, -2.0F, -2.0F); - this.body.addChild(forewingR); - this.setRotateAngle(forewingR, 0.5236F, 1.4835F, 0.0F); - this.forewingR.cubeList.add(new ModelBox(forewingR, 0, 6, -7.75F, -0.015F, -3.0F, 8, 0, 6, 0.0F, false)); - - this.forewingL = new AdvancedModelRenderer(this); - this.forewingL.setRotationPoint(2.0F, -2.0F, -2.0F); - this.body.addChild(forewingL); - this.setRotateAngle(forewingL, 0.5236F, -1.4835F, 0.0F); - this.forewingL.cubeList.add(new ModelBox(forewingL, 0, 0, -0.25F, -0.02F, -3.0F, 8, 0, 6, 0.0F, false)); - - this.hindwingL = new AdvancedModelRenderer(this); - this.hindwingL.setRotationPoint(2.0F, -2.0F, -1.0F); - this.body.addChild(hindwingL); - this.setRotateAngle(hindwingL, 0.0F, -0.4363F, 0.3491F); - this.hindwingL.cubeList.add(new ModelBox(hindwingL, 16, 12, -1.5F, -0.01F, 0.0F, 4, 0, 5, 0.0F, false)); - - this.hindwingR = new AdvancedModelRenderer(this); - this.hindwingR.setRotationPoint(-2.0F, -2.0F, -1.0F); - this.body.addChild(hindwingR); - this.setRotateAngle(hindwingR, 0.0F, 0.4363F, -0.3491F); - this.hindwingR.cubeList.add(new ModelBox(hindwingR, 8, 12, -2.5F, -0.005F, 0.0F, 4, 0, 5, 0.0F, false)); + this.mouthpart.cubeList.add(new ModelBox(mouthpart, 14, 15, 0.0F, -0.1F, 0.1F, 0, 2, 1, 0.0F, false)); + + this.legright = new AdvancedModelRenderer(this); + this.legright.setRotationPoint(-0.75F, 0.0F, -2.5F); + this.body.addChild(legright); + this.setRotateAngle(legright, 0.0F, -1.2217F, 0.0F); + this.legright.cubeList.add(new ModelBox(legright, 6, 15, -1.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, false)); + + this.legleft = new AdvancedModelRenderer(this); + this.legleft.setRotationPoint(0.75F, 0.0F, -2.5F); + this.body.addChild(legleft); + this.setRotateAngle(legleft, 0.0F, 1.2217F, 0.0F); + this.legleft.cubeList.add(new ModelBox(legleft, 6, 15, -0.5F, -0.5F, 0.0F, 2, 2, 0, 0.0F, true)); + + this.legright2 = new AdvancedModelRenderer(this); + this.legright2.setRotationPoint(-1.0F, 0.0F, -1.75F); + this.body.addChild(legright2); + this.setRotateAngle(legright2, 0.0F, 0.3927F, 0.0F); + this.legright2.cubeList.add(new ModelBox(legright2, 12, 13, -2.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, false)); + + this.legleft2 = new AdvancedModelRenderer(this); + this.legleft2.setRotationPoint(1.0F, 0.0F, -1.75F); + this.body.addChild(legleft2); + this.setRotateAngle(legleft2, 0.0F, -0.3927F, 0.0F); + this.legleft2.cubeList.add(new ModelBox(legleft2, 12, 13, -0.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, true)); + + this.legright3 = new AdvancedModelRenderer(this); + this.legright3.setRotationPoint(-1.0F, 0.0F, -1.25F); + this.body.addChild(legright3); + this.setRotateAngle(legright3, 0.0F, 0.9599F, 0.0F); + this.legright3.cubeList.add(new ModelBox(legright3, 0, 15, -2.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, false)); + + this.legleft3 = new AdvancedModelRenderer(this); + this.legleft3.setRotationPoint(1.0F, 0.0F, -1.25F); + this.body.addChild(legleft3); + this.setRotateAngle(legleft3, 0.0F, -0.9599F, 0.0F); + this.legleft3.cubeList.add(new ModelBox(legleft3, 0, 15, -0.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, true)); + + this.forewingright = new AdvancedModelRenderer(this); + this.forewingright.setRotationPoint(-1.25F, -2.0F, -2.75F); + this.body.addChild(forewingright); + this.setRotateAngle(forewingright, 0.0F, -0.0436F, 0.0F); + this.forewingright.cubeList.add(new ModelBox(forewingright, 0, 0, -8.75F, -0.015F, -2.0F, 9, 0, 4, 0.0F, false)); + + this.forewingleft = new AdvancedModelRenderer(this); + this.forewingleft.setRotationPoint(1.25F, -2.0F, -2.75F); + this.body.addChild(forewingleft); + this.setRotateAngle(forewingleft, 0.0F, 0.0436F, 0.0F); + this.forewingleft.cubeList.add(new ModelBox(forewingleft, 0, 0, -0.25F, -0.015F, -2.0F, 9, 0, 4, 0.0F, true)); + + this.hindwingright = new AdvancedModelRenderer(this); + this.hindwingright.setRotationPoint(-1.25F, -2.0F, -1.75F); + this.body.addChild(hindwingright); + this.setRotateAngle(hindwingright, 0.0F, -1.1781F, 0.0F); + this.hindwingright.cubeList.add(new ModelBox(hindwingright, 0, 4, -0.5F, -0.005F, -0.25F, 4, 0, 5, 0.0F, false)); + this.hindwingleft = new AdvancedModelRenderer(this); + this.hindwingleft.setRotationPoint(1.25F, -2.0F, -1.75F); + this.body.addChild(hindwingleft); + this.setRotateAngle(hindwingleft, 0.0F, 1.1781F, 0.0F); + this.hindwingleft.cubeList.add(new ModelBox(hindwingleft, 0, 4, -3.5F, -0.005F, -0.25F, 4, 0, 5, 0.0F, true)); updateDefaultPose(); } @@ -110,42 +119,24 @@ public void render(Entity entity, float f, float f1, float f2, float f3, float f GlStateManager.disableBlend(); GlStateManager.popMatrix(); } + public void renderStaticSuspended(float f) { + this.body.offsetY = 0.0F; + this.body.render(0.01f); + } + public void renderStaticFloor(float f) { + this.body.offsetY = -0.3F; + this.body.render(0.01f); + } public void renderStaticDisplayCase(float f) { - //this.body.offsetZ = -0.080F; - this.setRotateAngle(hindwingR, 0.0F, (float)Math.toRadians(30), -(float)Math.toRadians(20)); - this.setRotateAngle(forewingR, 0.0F, (float)Math.toRadians(15), (float)Math.toRadians(20)); - this.setRotateAngle(forewingL, 0.0F, -(float)Math.toRadians(15), -(float)Math.toRadians(20)); - this.setRotateAngle(hindwingL, 0.0F, -(float)Math.toRadians(30), (float)Math.toRadians(20)); + this.body.offsetY = -0.3F; this.body.render(0.01f); resetToDefaultPose(); } @Override public void renderStaticBook(float f) { - //Rotations, positions and sizing: - this.body.offsetY = -1.6F; - this.body.offsetX = -0.4F; - this.body.offsetZ = 2.0F; - this.body.rotateAngleY = (float)Math.toRadians(120); - this.body.rotateAngleX = (float)Math.toRadians(1); - this.body.rotateAngleZ = (float)Math.toRadians(0); - this.body.scaleChildren = true; - float scaler = 4.2F; - this.body.setScale(scaler, scaler, scaler); - //Start of pose: - this.setRotateAngle(body, 0.6F, 3.8F, -0.2F); - this.setRotateAngle(hindwingR, 0.0F, (float)Math.toRadians(30), -(float)Math.toRadians(20)); - this.setRotateAngle(forewingR, 0.0F, (float)Math.toRadians(15), (float)Math.toRadians(20)); - this.setRotateAngle(forewingL, 0.0F, -(float)Math.toRadians(15), -(float)Math.toRadians(20)); - this.setRotateAngle(hindwingL, 0.0F, -(float)Math.toRadians(30), (float)Math.toRadians(20)); - //End of pose, now render the model: - this.body.render(f); - //Reset rotations, positions and sizing: - this.body.setScale(1.0F, 1.0F, 1.0F); - this.body.scaleChildren = false; - resetToDefaultPose(); } @@ -156,32 +147,188 @@ public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float } @Override - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity e) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, e); + public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + super.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); this.resetToDefaultPose(); - this.body.offsetY = 1.05F; + EntityPrehistoricFloraPalaeontinid ee = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + + + if (ee.flyProgress != 0 && ee.getAttachmentPos() == null) {//if flying + animFlying(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); + + + } else {//not flying + this.setRotateAngle(body, body.rotateAngleX, body.rotateAngleY, body.rotateAngleZ); + this.setRotateAngle(legleft, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(70), body.rotateAngleZ+(float)Math.toRadians(-30)); + this.setRotateAngle(legright, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-70), body.rotateAngleZ+(float)Math.toRadians(30)); + this.setRotateAngle(legleft2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(22.5), body.rotateAngleZ+(float)Math.toRadians(-12.5)); + this.setRotateAngle(legright2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-22.5), body.rotateAngleZ+(float)Math.toRadians(12.5)); + this.setRotateAngle(legleft3, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-55), body.rotateAngleZ+(float)Math.toRadians(-15)); + this.setRotateAngle(legright3, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(55), body.rotateAngleZ+(float)Math.toRadians(15)); + this.forewingleft.offsetY = -0.01F; + this.forewingright.offsetY = -0.01F; + this.setRotateAngle(forewingleft, body.rotateAngleX-(float)Math.toRadians(-20.725581875), body.rotateAngleY-(float)Math.toRadians(-2.5+83.345817451), body.rotateAngleZ+(float)Math.toRadians(7.398342519)); + this.setRotateAngle(forewingright, body.rotateAngleX-(float)Math.toRadians(-20.725581875), body.rotateAngleY-(float)Math.toRadians(2.5-83.345817451), body.rotateAngleZ+(float)Math.toRadians(-7.398342519)); + this.setRotateAngle(hindwingleft, body.rotateAngleX+(float)Math.toRadians(-6.5466568), body.rotateAngleY-(float)Math.toRadians(-67.5+21.926770242), body.rotateAngleZ-(float)Math.toRadians(-26.623885511)); + this.setRotateAngle(hindwingright, body.rotateAngleX+(float)Math.toRadians(-6.5466568), body.rotateAngleY-(float)Math.toRadians(67.5-21.926770242), body.rotateAngleZ-(float)Math.toRadians(26.623885511)); + } + + } + + public void animFlying(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + EntityPrehistoricFloraPalaeontinid entity = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + int animCycle = 3; + double tickAnim = (entity.ticksExisted + entity.getTickOffset()) - (int) (Math.floor((double) (entity.ticksExisted + entity.getTickOffset()) / (double) animCycle) * (double) animCycle) + partialTickTime; + double xx = 0; + double yy = 0; + double zz = 0; + this.setRotateAngle(legright, legright.rotateAngleX + (float) Math.toRadians(0), legright.rotateAngleY + (float) Math.toRadians(0), legright.rotateAngleZ + (float) Math.toRadians(-40)); + + + this.setRotateAngle(legright2, legright2.rotateAngleX + (float) Math.toRadians(0), legright2.rotateAngleY + (float) Math.toRadians(0), legright2.rotateAngleZ + (float) Math.toRadians(-50)); + + + this.setRotateAngle(legright3, legright3.rotateAngleX + (float) Math.toRadians(0), legright3.rotateAngleY + (float) Math.toRadians(0), legright3.rotateAngleZ + (float) Math.toRadians(-70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = -15 + (((tickAnim - 0) / 1) * (1.61907-(-15))); + zz = 30 + (((tickAnim - 0) / 1) * (-26.11108-(30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = 1.61907 + (((tickAnim - 1) / 1) * (15-(1.61907))); + zz = -26.11108 + (((tickAnim - 1) / 1) * (-35-(-26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = 15 + (((tickAnim - 2) / 1) * (15.79951-(15))); + zz = -35 + (((tickAnim - 2) / 1) * (13.64417-(-35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = 15.79951 + (((tickAnim - 3) / 0) * (-15-(15.79951))); + zz = 13.64417 + (((tickAnim - 3) / 0) * (30-(13.64417))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingright, forewingright.rotateAngleX + (float) Math.toRadians(xx), forewingright.rotateAngleY + (float) Math.toRadians(yy), forewingright.rotateAngleZ + (float) Math.toRadians(zz)); - EntityPrehistoricFloraInsectFlyingBase ee = (EntityPrehistoricFloraInsectFlyingBase) e; - if (ee.flyProgress != 0 && ee.getAttachmentPos() == null) { //flying pose - this.setRotateAngle(hindwingR, 0.0F, (float)Math.toRadians(30), -(float)Math.toRadians(20)); - this.setRotateAngle(forewingR, 0.0F, (float)Math.toRadians(15), (float)Math.toRadians(20)); - this.setRotateAngle(forewingL, 0.0F, -(float)Math.toRadians(15), -(float)Math.toRadians(20)); - this.setRotateAngle(hindwingL, 0.0F, -(float)Math.toRadians(30), (float)Math.toRadians(20)); - float modifier = 1F; - this.flap(forewingL,2.2F * modifier, 0.5F, true, 0,0, f2, 1F); - this.flap(hindwingL,2.2F * modifier, 0.5F, true, 3,0, f2, 1F); - this.flap(forewingR,2.2F * modifier, 0.5F, false, 0,0, f2, 1F); - this.flap(hindwingR,2.2F * modifier, 0.5F, false, 3,0F, f2, 1F); - this.flap(legL1,1.2F * modifier, 0.1F, true, 1,0, f2, 1F); - this.flap(legL2,1.2F * modifier, 0.1F, true, 2,0, f2, 1F); - this.flap(legL3,1.2F * modifier, 0.1F, true, 1,0, f2, 1F); - this.flap(legR1,1.2F * modifier, 0.1F, false, 1,0, f2, 1F); - this.flap(legR2,1.2F * modifier, 0.1F, false, 2,0, f2, 1F); - this.flap(legR3,1.2F * modifier, 0.1F, false, 1,0, f2, 1F); + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = -14.36611 + (((tickAnim - 0) / 1) * (-5.60045-(-14.36611))); + zz = -18.52093 + (((tickAnim - 0) / 1) * (-88.95124-(-18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = -5.60045 + (((tickAnim - 1) / 1) * (13.41891-(-5.60045))); + zz = -88.95124 + (((tickAnim - 1) / 1) * (38.6557-(-88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = 13.41891 + (((tickAnim - 2) / 1) * (15.8477-(13.41891))); + zz = 38.6557 + (((tickAnim - 2) / 1) * (33.62629-(38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = 15.8477 + (((tickAnim - 3) / 0) * (-14.36611-(15.8477))); + zz = 33.62629 + (((tickAnim - 3) / 0) * (-18.52093-(33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingright, hindwingright.rotateAngleX + (float) Math.toRadians(xx), hindwingright.rotateAngleY + (float) Math.toRadians(yy), hindwingright.rotateAngleZ + (float) Math.toRadians(zz)); + + + + this.body.rotationPointX = this.body.rotationPointX + (float)(0); + this.body.rotationPointY = this.body.rotationPointY - (float)(1.25); + this.body.rotationPointZ = this.body.rotationPointZ + (float)(0); + + + this.setRotateAngle(legleft, legleft.rotateAngleX + (float) Math.toRadians(0), legleft.rotateAngleY + (float) Math.toRadians(0), legleft.rotateAngleZ + (float) Math.toRadians(40)); + + this.setRotateAngle(legleft2, legleft2.rotateAngleX + (float) Math.toRadians(0), legleft2.rotateAngleY + (float) Math.toRadians(0), legleft2.rotateAngleZ + (float) Math.toRadians(50)); + + + this.setRotateAngle(legleft3, legleft3.rotateAngleX + (float) Math.toRadians(0), legleft3.rotateAngleY + (float) Math.toRadians(0), legleft3.rotateAngleZ + (float) Math.toRadians(70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = 15 + (((tickAnim - 0) / 1) * (-1.61907-(15))); + zz = -30 + (((tickAnim - 0) / 1) * (26.11108-(-30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = -1.61907 + (((tickAnim - 1) / 1) * (-15-(-1.61907))); + zz = 26.11108 + (((tickAnim - 1) / 1) * (35-(26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = -15 + (((tickAnim - 2) / 1) * (-15.79951-(-15))); + zz = 35 + (((tickAnim - 2) / 1) * (-13.64417-(35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = -15.79951 + (((tickAnim - 3) / 0) * (15-(-15.79951))); + zz = -13.64417 + (((tickAnim - 3) / 0) * (-30-(-13.64417))); } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingleft, forewingleft.rotateAngleX + (float) Math.toRadians(xx), forewingleft.rotateAngleY + (float) Math.toRadians(yy), forewingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = 14.36611 + (((tickAnim - 0) / 1) * (5.60045-(14.36611))); + zz = 18.52093 + (((tickAnim - 0) / 1) * (88.95124-(18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = 5.60045 + (((tickAnim - 1) / 1) * (-13.41891-(5.60045))); + zz = 88.95124 + (((tickAnim - 1) / 1) * (-38.6557-(88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = -13.41891 + (((tickAnim - 2) / 1) * (-15.8477-(-13.41891))); + zz = -38.6557 + (((tickAnim - 2) / 1) * (-33.62629-(-38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = -15.8477 + (((tickAnim - 3) / 0) * (14.36611-(-15.8477))); + zz = -33.62629 + (((tickAnim - 3) / 0) * (18.52093-(-33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingleft, hindwingleft.rotateAngleX + (float) Math.toRadians(xx), hindwingleft.rotateAngleY + (float) Math.toRadians(yy), hindwingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + + } + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity e) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, e); + + } } diff --git a/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidLong.java b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidLong.java new file mode 100644 index 0000000000..eb692dd660 --- /dev/null +++ b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidLong.java @@ -0,0 +1,332 @@ +package net.lepidodendron.entity.model.entity; + +import net.ilexiconn.llibrary.client.model.tools.AdvancedModelRenderer; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.lepidodendron.entity.model.ModelBasePalaeopedia; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; + +public class ModelPalaeontinidLong extends ModelBasePalaeopedia { + private final AdvancedModelRenderer body; + private final AdvancedModelRenderer body2; + private final AdvancedModelRenderer mouthpart; + private final AdvancedModelRenderer legright; + private final AdvancedModelRenderer legleft; + private final AdvancedModelRenderer legright2; + private final AdvancedModelRenderer legleft2; + private final AdvancedModelRenderer legright3; + private final AdvancedModelRenderer legleft3; + private final AdvancedModelRenderer forewingright; + private final AdvancedModelRenderer forewingleft; + private final AdvancedModelRenderer hindwingright; + private final AdvancedModelRenderer hindwingleft; + + public ModelPalaeontinidLong() { + this.textureWidth = 32; + this.textureHeight = 32; + + this.body = new AdvancedModelRenderer(this); + this.body.setRotationPoint(0.0F, 22.5F, 0.0F); + this.body.cubeList.add(new ModelBox(body, 0, 14, -2.0F, -2.0F, -3.0F, 4, 2, 4, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 14, 21, -1.0F, -1.45F, -3.5F, 2, 1, 1, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 0, 22, -0.5F, -1.45F, -3.5F, 1, 1, 1, 0.01F, false)); + + this.body2 = new AdvancedModelRenderer(this); + this.body2.setRotationPoint(0.0F, -2.0F, 1.0F); + this.body.addChild(body2); + this.setRotateAngle(body2, -0.0873F, 0.0F, 0.0F); + this.body2.cubeList.add(new ModelBox(body2, 16, 14, -1.5F, 0.0F, 0.0F, 3, 2, 3, 0.0F, false)); + this.body2.cubeList.add(new ModelBox(body2, 8, 20, -1.0F, 0.5F, 3.0F, 2, 1, 1, 0.0F, false)); + + this.mouthpart = new AdvancedModelRenderer(this); + this.mouthpart.setRotationPoint(0.0F, 0.0F, -3.5F); + this.body.addChild(mouthpart); + this.setRotateAngle(mouthpart, 1.2654F, 0.0F, 0.0F); + this.mouthpart.cubeList.add(new ModelBox(mouthpart, 4, 22, 0.0F, -0.1F, 0.1F, 0, 2, 1, 0.0F, false)); + + this.legright = new AdvancedModelRenderer(this); + this.legright.setRotationPoint(-0.75F, 0.0F, -2.0F); + this.body.addChild(legright); + this.setRotateAngle(legright, 0.0F, -1.2217F, 0.0F); + this.legright.cubeList.add(new ModelBox(legright, 20, 21, -2.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, false)); + + this.legleft = new AdvancedModelRenderer(this); + this.legleft.setRotationPoint(0.75F, 0.0F, -2.0F); + this.body.addChild(legleft); + this.setRotateAngle(legleft, 0.0F, 1.2217F, 0.0F); + this.legleft.cubeList.add(new ModelBox(legleft, 20, 21, -0.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, true)); + + this.legright2 = new AdvancedModelRenderer(this); + this.legright2.setRotationPoint(-1.0F, 0.0F, -0.75F); + this.body.addChild(legright2); + this.setRotateAngle(legright2, 0.0F, 0.3927F, -0.0873F); + this.legright2.cubeList.add(new ModelBox(legright2, 0, 20, -3.5F, -0.5F, 0.0F, 4, 2, 0, 0.0F, false)); + + this.legleft2 = new AdvancedModelRenderer(this); + this.legleft2.setRotationPoint(1.0F, 0.0F, -0.75F); + this.body.addChild(legleft2); + this.setRotateAngle(legleft2, 0.0F, -0.3927F, 0.0873F); + this.legleft2.cubeList.add(new ModelBox(legleft2, 0, 20, -0.5F, -0.5F, 0.0F, 4, 2, 0, 0.0F, true)); + + this.legright3 = new AdvancedModelRenderer(this); + this.legright3.setRotationPoint(-1.0F, 0.0F, 0.25F); + this.body.addChild(legright3); + this.setRotateAngle(legright3, 0.1309F, 0.9163F, 0.3491F); + this.legright3.cubeList.add(new ModelBox(legright3, 6, 23, -4.5F, -0.5F, 0.0F, 5, 3, 0, 0.0F, false)); + + this.legleft3 = new AdvancedModelRenderer(this); + this.legleft3.setRotationPoint(1.0F, 0.0F, 0.25F); + this.body.addChild(legleft3); + this.setRotateAngle(legleft3, 0.1309F, -0.9163F, -0.3491F); + this.legleft3.cubeList.add(new ModelBox(legleft3, 6, 23, -0.5F, -0.5F, 0.0F, 5, 3, 0, 0.0F, true)); + + this.forewingright = new AdvancedModelRenderer(this); + this.forewingright.setRotationPoint(-2.0F, -2.0F, -2.0F); + this.body.addChild(forewingright); + this.setRotateAngle(forewingright, 0.0F, 0.0873F, 0.0F); + this.forewingright.cubeList.add(new ModelBox(forewingright, 0, 0, -10.75F, -0.015F, -3.0F, 11, 0, 7, 0.0F, false)); + + this.forewingleft = new AdvancedModelRenderer(this); + this.forewingleft.setRotationPoint(2.0F, -2.0F, -2.0F); + this.body.addChild(forewingleft); + this.setRotateAngle(forewingleft, 0.0F, -0.0873F, 0.0F); + this.forewingleft.cubeList.add(new ModelBox(forewingleft, 0, 0, -0.25F, -0.015F, -3.0F, 11, 0, 7, 0.0F, true)); + + this.hindwingright = new AdvancedModelRenderer(this); + this.hindwingright.setRotationPoint(-1.75F, -2.0F, 0.0F); + this.body.addChild(hindwingright); + this.setRotateAngle(hindwingright, 0.0F, -1.1781F, 0.0F); + this.hindwingright.cubeList.add(new ModelBox(hindwingright, 0, 7, -0.5F, -0.005F, -0.25F, 4, 0, 7, 0.0F, false)); + + this.hindwingleft = new AdvancedModelRenderer(this); + this.hindwingleft.setRotationPoint(1.75F, -2.0F, 0.0F); + this.body.addChild(hindwingleft); + this.setRotateAngle(hindwingleft, 0.0F, 1.1781F, 0.0F); + this.hindwingleft.cubeList.add(new ModelBox(hindwingleft, 0, 7, -3.5F, -0.005F, -0.25F, 4, 0, 7, 0.0F, true)); + updateDefaultPose(); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + this.body.render(f5); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + public void renderStaticSuspended(float f) { + this.body.offsetY = 0.0F; + this.body.render(0.01f); + } + + public void renderStaticFloor(float f) { + this.body.offsetY = -0.3F; + this.body.render(0.01f); + } + + public void renderStaticDisplayCase(float f) { + this.body.offsetY = -0.3F; + this.body.render(0.01f); + resetToDefaultPose(); + } + + @Override + public void renderStaticBook(float f) { + + } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } + + @Override + public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + super.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); + this.resetToDefaultPose(); + EntityPrehistoricFloraPalaeontinid ee = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + + + if (ee.flyProgress != 0 && ee.getAttachmentPos() == null) {//if flying + animFlying(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); + + + } else {//not flying + this.setRotateAngle(legleft, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(70), body.rotateAngleZ+(float)Math.toRadians(-25)); + this.setRotateAngle(legright, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-70), body.rotateAngleZ+(float)Math.toRadians(25)); + this.setRotateAngle(legleft2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(22.5), body.rotateAngleZ+(float)Math.toRadians(5-12.5)); + this.setRotateAngle(legright2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-22.5), body.rotateAngleZ+(float)Math.toRadians(-5+12.5)); + this.setRotateAngle(legleft3, body.rotateAngleX+(float)Math.toRadians(-7.5), body.rotateAngleY+(float)Math.toRadians(-52.5), body.rotateAngleZ+(float)Math.toRadians(-20-10)); + this.setRotateAngle(legright3, body.rotateAngleX+(float)Math.toRadians(-7.5), body.rotateAngleY+(float)Math.toRadians(52.5), body.rotateAngleZ+(float)Math.toRadians(20+10)); + this.forewingleft.offsetY = -0.01F; + this.forewingright.offsetY = -0.01F; + this.setRotateAngle(forewingleft, body.rotateAngleX-(float)Math.toRadians(-30), -body.rotateAngleY-(float)Math.toRadians(5+70), body.rotateAngleZ+(float)Math.toRadians(0)); + this.setRotateAngle(forewingright, body.rotateAngleX-(float)Math.toRadians(-30), body.rotateAngleY-(float)Math.toRadians(-5-70), body.rotateAngleZ+(float)Math.toRadians(0)); + this.setRotateAngle(hindwingleft, body.rotateAngleX-(float)Math.toRadians(2.5), body.rotateAngleY-(float)Math.toRadians(-67.5+40.5), body.rotateAngleZ+(float)Math.toRadians(20)); + this.setRotateAngle(hindwingright, body.rotateAngleX-(float)Math.toRadians(2.5), body.rotateAngleY-(float)Math.toRadians(67.5-40.5), body.rotateAngleZ+(float)Math.toRadians(-20)); + } + + } + + public void animFlying(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + EntityPrehistoricFloraPalaeontinid entity = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + int animCycle = 3; + double tickAnim = (entity.ticksExisted + entity.getTickOffset()) - (int) (Math.floor((double) (entity.ticksExisted + entity.getTickOffset()) / (double) animCycle) * (double) animCycle) + partialTickTime; + double xx = 0; + double yy = 0; + double zz = 0; + this.setRotateAngle(legright, legright.rotateAngleX + (float) Math.toRadians(0), legright.rotateAngleY + (float) Math.toRadians(0), legright.rotateAngleZ + (float) Math.toRadians(-40)); + + + this.setRotateAngle(legright2, legright2.rotateAngleX + (float) Math.toRadians(0), legright2.rotateAngleY + (float) Math.toRadians(0), legright2.rotateAngleZ + (float) Math.toRadians(-50)); + + + this.setRotateAngle(legright3, legright3.rotateAngleX + (float) Math.toRadians(0), legright3.rotateAngleY + (float) Math.toRadians(0), legright3.rotateAngleZ + (float) Math.toRadians(-70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = -15 + (((tickAnim - 0) / 1) * (1.61907-(-15))); + zz = 30 + (((tickAnim - 0) / 1) * (-26.11108-(30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = 1.61907 + (((tickAnim - 1) / 1) * (15-(1.61907))); + zz = -26.11108 + (((tickAnim - 1) / 1) * (-35-(-26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = 15 + (((tickAnim - 2) / 1) * (15.79951-(15))); + zz = -35 + (((tickAnim - 2) / 1) * (13.64417-(-35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = 15.79951 + (((tickAnim - 3) / 0) * (-15-(15.79951))); + zz = 13.64417 + (((tickAnim - 3) / 0) * (30-(13.64417))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingright, forewingright.rotateAngleX + (float) Math.toRadians(xx), forewingright.rotateAngleY + (float) Math.toRadians(yy), forewingright.rotateAngleZ + (float) Math.toRadians(zz)); + + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = -14.36611 + (((tickAnim - 0) / 1) * (-5.60045-(-14.36611))); + zz = -18.52093 + (((tickAnim - 0) / 1) * (-88.95124-(-18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = -5.60045 + (((tickAnim - 1) / 1) * (13.41891-(-5.60045))); + zz = -88.95124 + (((tickAnim - 1) / 1) * (38.6557-(-88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = 13.41891 + (((tickAnim - 2) / 1) * (15.8477-(13.41891))); + zz = 38.6557 + (((tickAnim - 2) / 1) * (33.62629-(38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = 15.8477 + (((tickAnim - 3) / 0) * (-14.36611-(15.8477))); + zz = 33.62629 + (((tickAnim - 3) / 0) * (-18.52093-(33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingright, hindwingright.rotateAngleX + (float) Math.toRadians(xx), hindwingright.rotateAngleY + (float) Math.toRadians(yy), hindwingright.rotateAngleZ + (float) Math.toRadians(zz)); + + + + this.setRotateAngle(legleft, legleft.rotateAngleX + (float) Math.toRadians(0), legleft.rotateAngleY + (float) Math.toRadians(0), legleft.rotateAngleZ + (float) Math.toRadians(40)); + + + this.setRotateAngle(legleft2, legleft2.rotateAngleX + (float) Math.toRadians(0), legleft2.rotateAngleY + (float) Math.toRadians(0), legleft2.rotateAngleZ + (float) Math.toRadians(50)); + + + this.setRotateAngle(legleft3, legleft3.rotateAngleX + (float) Math.toRadians(0), legleft3.rotateAngleY + (float) Math.toRadians(0), legleft3.rotateAngleZ + (float) Math.toRadians(70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = 15 + (((tickAnim - 0) / 1) * (-1.61907-(15))); + zz = -30 + (((tickAnim - 0) / 1) * (26.11108-(-30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = -1.61907 + (((tickAnim - 1) / 1) * (-15-(-1.61907))); + zz = 26.11108 + (((tickAnim - 1) / 1) * (35-(26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = -15 + (((tickAnim - 2) / 1) * (-15.79951-(-15))); + zz = 35 + (((tickAnim - 2) / 1) * (-13.64417-(35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = -15.79951 + (((tickAnim - 3) / 0) * (15-(-15.79951))); + zz = -13.64417 + (((tickAnim - 3) / 0) * (-30-(-13.64417))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingleft, forewingleft.rotateAngleX + (float) Math.toRadians(xx), forewingleft.rotateAngleY + (float) Math.toRadians(yy), forewingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = 14.36611 + (((tickAnim - 0) / 1) * (5.60045-(14.36611))); + zz = 18.52093 + (((tickAnim - 0) / 1) * (88.95124-(18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = 5.60045 + (((tickAnim - 1) / 1) * (-13.41891-(5.60045))); + zz = 88.95124 + (((tickAnim - 1) / 1) * (-38.6557-(88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = -13.41891 + (((tickAnim - 2) / 1) * (-15.8477-(-13.41891))); + zz = -38.6557 + (((tickAnim - 2) / 1) * (-33.62629-(-38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = -15.8477 + (((tickAnim - 3) / 0) * (14.36611-(-15.8477))); + zz = -33.62629 + (((tickAnim - 3) / 0) * (18.52093-(-33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingleft, hindwingleft.rotateAngleX + (float) Math.toRadians(xx), hindwingleft.rotateAngleY + (float) Math.toRadians(yy), hindwingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + + + this.body.rotationPointX = this.body.rotationPointX + (float)(0); + this.body.rotationPointY = this.body.rotationPointY - (float)(2); + this.body.rotationPointZ = this.body.rotationPointZ + (float)(0); + + } + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity e) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, e); + + + } +} diff --git a/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidShort.java b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidShort.java new file mode 100644 index 0000000000..b0d6e6021c --- /dev/null +++ b/src/main/java/net/lepidodendron/entity/model/entity/ModelPalaeontinidShort.java @@ -0,0 +1,331 @@ +package net.lepidodendron.entity.model.entity; + +import net.ilexiconn.llibrary.client.model.tools.AdvancedModelRenderer; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.lepidodendron.entity.model.ModelBasePalaeopedia; +import net.minecraft.client.model.ModelBox; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; + +public class ModelPalaeontinidShort extends ModelBasePalaeopedia { + private final AdvancedModelRenderer body; + private final AdvancedModelRenderer body2; + private final AdvancedModelRenderer mouthpart; + private final AdvancedModelRenderer legright; + private final AdvancedModelRenderer legleft; + private final AdvancedModelRenderer legright2; + private final AdvancedModelRenderer legleft2; + private final AdvancedModelRenderer legright3; + private final AdvancedModelRenderer legleft3; + private final AdvancedModelRenderer forewingright; + private final AdvancedModelRenderer forewingleft; + private final AdvancedModelRenderer hindwingright; + private final AdvancedModelRenderer hindwingleft; + + public ModelPalaeontinidShort() { + this.textureWidth = 40; + this.textureHeight = 32; + + this.body = new AdvancedModelRenderer(this); + this.body.setRotationPoint(0.0F, 22.5F, 0.0F); + this.body.cubeList.add(new ModelBox(body, 0, 17, -2.0F, -2.0F, -3.0F, 4, 2, 4, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 14, 24, -1.0F, -1.45F, -3.5F, 2, 1, 1, 0.0F, false)); + this.body.cubeList.add(new ModelBox(body, 0, 25, -0.5F, -1.45F, -3.5F, 1, 1, 1, 0.01F, false)); + + this.body2 = new AdvancedModelRenderer(this); + this.body2.setRotationPoint(0.0F, -1.9F, 1.0F); + this.body.addChild(body2); + this.setRotateAngle(body2, -0.0873F, 0.0F, 0.0F); + this.body2.cubeList.add(new ModelBox(body2, 16, 17, -2.0F, 0.0F, 0.0F, 4, 2, 2, -0.01F, false)); + this.body2.cubeList.add(new ModelBox(body2, 8, 23, -1.0F, 0.5F, 1.975F, 2, 1, 1, 0.0F, false)); + + this.mouthpart = new AdvancedModelRenderer(this); + this.mouthpart.setRotationPoint(0.0F, 0.0F, -3.5F); + this.body.addChild(mouthpart); + this.setRotateAngle(mouthpart, 1.2654F, 0.0F, 0.0F); + this.mouthpart.cubeList.add(new ModelBox(mouthpart, 4, 25, 0.0F, -0.1F, 0.1F, 0, 2, 1, 0.0F, false)); + + this.legright = new AdvancedModelRenderer(this); + this.legright.setRotationPoint(-0.75F, 0.0F, -2.0F); + this.body.addChild(legright); + this.setRotateAngle(legright, 0.0F, -1.2217F, 0.0F); + this.legright.cubeList.add(new ModelBox(legright, 20, 24, -2.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, false)); + + this.legleft = new AdvancedModelRenderer(this); + this.legleft.setRotationPoint(0.75F, 0.0F, -2.0F); + this.body.addChild(legleft); + this.setRotateAngle(legleft, 0.0F, 1.2217F, 0.0F); + this.legleft.cubeList.add(new ModelBox(legleft, 20, 24, -0.5F, -0.5F, 0.0F, 3, 2, 0, 0.0F, true)); + + this.legright2 = new AdvancedModelRenderer(this); + this.legright2.setRotationPoint(-1.0F, 0.0F, -0.75F); + this.body.addChild(legright2); + this.setRotateAngle(legright2, 0.0F, 0.3927F, -0.0873F); + this.legright2.cubeList.add(new ModelBox(legright2, 0, 23, -3.5F, -0.5F, 0.0F, 4, 2, 0, 0.0F, false)); + + this.legleft2 = new AdvancedModelRenderer(this); + this.legleft2.setRotationPoint(1.0F, 0.0F, -0.75F); + this.body.addChild(legleft2); + this.setRotateAngle(legleft2, 0.0F, -0.3927F, 0.0873F); + this.legleft2.cubeList.add(new ModelBox(legleft2, 0, 23, -0.5F, -0.5F, 0.0F, 4, 2, 0, 0.0F, true)); + + this.legright3 = new AdvancedModelRenderer(this); + this.legright3.setRotationPoint(-1.0F, 0.0F, 0.25F); + this.body.addChild(legright3); + this.setRotateAngle(legright3, 0.1309F, 0.9163F, 0.3491F); + this.legright3.cubeList.add(new ModelBox(legright3, 16, 21, -4.5F, -0.5F, 0.0F, 5, 3, 0, 0.0F, false)); + + this.legleft3 = new AdvancedModelRenderer(this); + this.legleft3.setRotationPoint(1.0F, 0.0F, 0.25F); + this.body.addChild(legleft3); + this.setRotateAngle(legleft3, 0.1309F, -0.9163F, -0.3491F); + this.legleft3.cubeList.add(new ModelBox(legleft3, 16, 21, -0.5F, -0.5F, 0.0F, 5, 3, 0, 0.0F, true)); + + this.forewingright = new AdvancedModelRenderer(this); + this.forewingright.setRotationPoint(-2.0F, -2.0F, -2.75F); + this.body.addChild(forewingright); + this.setRotateAngle(forewingright, 0.0F, -0.0436F, 0.0F); + this.forewingright.cubeList.add(new ModelBox(forewingright, 0, 0, -15.75F, -0.015F, -2.0F, 16, 0, 8, 0.0F, false)); + + this.forewingleft = new AdvancedModelRenderer(this); + this.forewingleft.setRotationPoint(2.0F, -2.0F, -2.75F); + this.body.addChild(forewingleft); + this.setRotateAngle(forewingleft, 0.0F, 0.0436F, 0.0F); + this.forewingleft.cubeList.add(new ModelBox(forewingleft, 0, 0, -0.25F, -0.015F, -2.0F, 16, 0, 8, 0.0F, true)); + + this.hindwingright = new AdvancedModelRenderer(this); + this.hindwingright.setRotationPoint(-1.75F, -2.0F, -1.25F); + this.body.addChild(hindwingright); + this.setRotateAngle(hindwingright, 0.0F, -1.1781F, 0.0F); + this.hindwingright.cubeList.add(new ModelBox(hindwingright, 0, 8, -0.5F, -0.005F, -0.25F, 6, 0, 9, 0.0F, false)); + + this.hindwingleft = new AdvancedModelRenderer(this); + this.hindwingleft.setRotationPoint(1.75F, -2.0F, -1.25F); + this.body.addChild(hindwingleft); + this.setRotateAngle(hindwingleft, 0.0F, 1.1781F, 0.0F); + this.hindwingleft.cubeList.add(new ModelBox(hindwingleft, 0, 8, -5.5F, -0.005F, -0.25F, 6, 0, 9, 0.0F, true)); + updateDefaultPose(); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + GlStateManager.pushMatrix(); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + this.body.render(f5); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + public void renderStaticSuspended(float f) { + this.body.offsetY = 0.0F; + this.body.render(0.01f); + } + + public void renderStaticFloor(float f) { + this.body.offsetY = -0.3F; + this.body.render(0.01f); + } + + public void renderStaticDisplayCase(float f) { + this.body.offsetY = -0.3F; + this.body.render(0.01f); + resetToDefaultPose(); + } + + @Override + public void renderStaticBook(float f) { + + } + + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } + + @Override + public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + super.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); + this.resetToDefaultPose(); + EntityPrehistoricFloraPalaeontinid ee = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + + + if (ee.flyProgress != 0 && ee.getAttachmentPos() == null) {//if flying + animFlying(entitylivingbaseIn, limbSwing, limbSwingAmount, partialTickTime); + + + } else {//not flying + this.setRotateAngle(legleft, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(70), body.rotateAngleZ+(float)Math.toRadians(-25)); + this.setRotateAngle(legright, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-70), body.rotateAngleZ+(float)Math.toRadians(25)); + this.setRotateAngle(legleft2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(22.5), body.rotateAngleZ+(float)Math.toRadians(5-12.5)); + this.setRotateAngle(legright2, body.rotateAngleX, body.rotateAngleY+(float)Math.toRadians(-22.5), body.rotateAngleZ+(float)Math.toRadians(-5+12.5)); + this.setRotateAngle(legleft3, body.rotateAngleX+(float)Math.toRadians(-7.5), body.rotateAngleY+(float)Math.toRadians(-52.5), body.rotateAngleZ+(float)Math.toRadians(-20-10)); + this.setRotateAngle(legright3, body.rotateAngleX+(float)Math.toRadians(-7.5), body.rotateAngleY+(float)Math.toRadians(52.5), body.rotateAngleZ+(float)Math.toRadians(20+10)); + this.forewingleft.offsetY = -0.01F; + this.forewingright.offsetY = -0.01F; + this.setRotateAngle(forewingleft, body.rotateAngleX-(float)Math.toRadians(-12.409570727), body.rotateAngleY-(float)Math.toRadians(-2.5+65.447916625), body.rotateAngleZ+(float)Math.toRadians(24.258201587)); + this.setRotateAngle(forewingright, body.rotateAngleX-(float)Math.toRadians(-12.409570727), body.rotateAngleY-(float)Math.toRadians(2.5-65.447916625), body.rotateAngleZ+(float)Math.toRadians(-24.258201587)); + this.setRotateAngle(hindwingleft, body.rotateAngleX-(float)Math.toRadians(-3.127311441), body.rotateAngleY-(float)Math.toRadians(-67.5+25.527958363), body.rotateAngleZ+(float)Math.toRadians(32.13442234)); + this.setRotateAngle(hindwingright, body.rotateAngleX-(float)Math.toRadians(-3.127311441), body.rotateAngleY-(float)Math.toRadians(67.5-25.527958363), body.rotateAngleZ+(float)Math.toRadians(-32.13442234)); + } + + } + + public void animFlying(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + EntityPrehistoricFloraPalaeontinid entity = (EntityPrehistoricFloraPalaeontinid) entitylivingbaseIn; + int animCycle = 3; + double tickAnim = (entity.ticksExisted + entity.getTickOffset()) - (int) (Math.floor((double) (entity.ticksExisted + entity.getTickOffset()) / (double) animCycle) * (double) animCycle) + partialTickTime; + double xx = 0; + double yy = 0; + double zz = 0; + this.setRotateAngle(legright, legright.rotateAngleX + (float) Math.toRadians(0), legright.rotateAngleY + (float) Math.toRadians(0), legright.rotateAngleZ + (float) Math.toRadians(-40)); + + + this.setRotateAngle(legright2, legright2.rotateAngleX + (float) Math.toRadians(0), legright2.rotateAngleY + (float) Math.toRadians(0), legright2.rotateAngleZ + (float) Math.toRadians(-50)); + + + this.setRotateAngle(legright3, legright3.rotateAngleX + (float) Math.toRadians(0), legright3.rotateAngleY + (float) Math.toRadians(0), legright3.rotateAngleZ + (float) Math.toRadians(-70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = -15 + (((tickAnim - 0) / 1) * (1.61907-(-15))); + zz = 30 + (((tickAnim - 0) / 1) * (-26.11108-(30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = 1.61907 + (((tickAnim - 1) / 1) * (15-(1.61907))); + zz = -26.11108 + (((tickAnim - 1) / 1) * (-35-(-26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = 15 + (((tickAnim - 2) / 1) * (15.79951-(15))); + zz = -35 + (((tickAnim - 2) / 1) * (13.64417-(-35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = 15.79951 + (((tickAnim - 3) / 0) * (-15-(15.79951))); + zz = 13.64417 + (((tickAnim - 3) / 0) * (30-(13.64417))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingright, forewingright.rotateAngleX + (float) Math.toRadians(xx), forewingright.rotateAngleY + (float) Math.toRadians(yy), forewingright.rotateAngleZ + (float) Math.toRadians(zz)); + + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = -14.36611 + (((tickAnim - 0) / 1) * (-5.60045-(-14.36611))); + zz = -18.52093 + (((tickAnim - 0) / 1) * (-88.95124-(-18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = -5.60045 + (((tickAnim - 1) / 1) * (13.41891-(-5.60045))); + zz = -88.95124 + (((tickAnim - 1) / 1) * (38.6557-(-88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = 13.41891 + (((tickAnim - 2) / 1) * (15.8477-(13.41891))); + zz = 38.6557 + (((tickAnim - 2) / 1) * (33.62629-(38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = 15.8477 + (((tickAnim - 3) / 0) * (-14.36611-(15.8477))); + zz = 33.62629 + (((tickAnim - 3) / 0) * (-18.52093-(33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingright, hindwingright.rotateAngleX + (float) Math.toRadians(xx), hindwingright.rotateAngleY + (float) Math.toRadians(yy), hindwingright.rotateAngleZ + (float) Math.toRadians(zz)); + + + + this.body.rotationPointX = this.body.rotationPointX + (float)(0); + this.body.rotationPointY = this.body.rotationPointY - (float)(2); + this.body.rotationPointZ = this.body.rotationPointZ + (float)(0); + + + this.setRotateAngle(legleft, legleft.rotateAngleX + (float) Math.toRadians(0), legleft.rotateAngleY + (float) Math.toRadians(0), legleft.rotateAngleZ + (float) Math.toRadians(40)); + + + this.setRotateAngle(legleft2, legleft2.rotateAngleX + (float) Math.toRadians(0), legleft2.rotateAngleY + (float) Math.toRadians(0), legleft2.rotateAngleZ + (float) Math.toRadians(50)); + + + this.setRotateAngle(legleft3, legleft3.rotateAngleX + (float) Math.toRadians(0), legleft3.rotateAngleY + (float) Math.toRadians(0), legleft3.rotateAngleZ + (float) Math.toRadians(70)); + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = -10 + (((tickAnim - 0) / 1) * (21.71272-(-10))); + yy = 15 + (((tickAnim - 0) / 1) * (-1.61907-(15))); + zz = -30 + (((tickAnim - 0) / 1) * (26.11108-(-30))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 21.71272 + (((tickAnim - 1) / 1) * (-27.5-(21.71272))); + yy = -1.61907 + (((tickAnim - 1) / 1) * (-15-(-1.61907))); + zz = 26.11108 + (((tickAnim - 1) / 1) * (35-(26.11108))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -27.5 + (((tickAnim - 2) / 1) * (-43.45608-(-27.5))); + yy = -15 + (((tickAnim - 2) / 1) * (-15.79951-(-15))); + zz = 35 + (((tickAnim - 2) / 1) * (-13.64417-(35))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -43.45608 + (((tickAnim - 3) / 0) * (-10-(-43.45608))); + yy = -15.79951 + (((tickAnim - 3) / 0) * (15-(-15.79951))); + zz = -13.64417 + (((tickAnim - 3) / 0) * (-30-(-13.64417))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(forewingleft, forewingleft.rotateAngleX + (float) Math.toRadians(xx), forewingleft.rotateAngleY + (float) Math.toRadians(yy), forewingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + + + + if (tickAnim >= 0 && tickAnim < 1) { + xx = 28.01295 + (((tickAnim - 0) / 1) * (67.26843-(28.01295))); + yy = 14.36611 + (((tickAnim - 0) / 1) * (5.60045-(14.36611))); + zz = 18.52093 + (((tickAnim - 0) / 1) * (88.95124-(18.52093))); + } + else if (tickAnim >= 1 && tickAnim < 2) { + xx = 67.26843 + (((tickAnim - 1) / 1) * (-89.43158-(67.26843))); + yy = 5.60045 + (((tickAnim - 1) / 1) * (-13.41891-(5.60045))); + zz = 88.95124 + (((tickAnim - 1) / 1) * (-38.6557-(88.95124))); + } + else if (tickAnim >= 2 && tickAnim < 3) { + xx = -89.43158 + (((tickAnim - 2) / 1) * (-63.2616-(-89.43158))); + yy = -13.41891 + (((tickAnim - 2) / 1) * (-15.8477-(-13.41891))); + zz = -38.6557 + (((tickAnim - 2) / 1) * (-33.62629-(-38.6557))); + } + else if (tickAnim >= 3 && tickAnim < 3) { + xx = -63.2616 + (((tickAnim - 3) / 0) * (28.01295-(-63.2616))); + yy = -15.8477 + (((tickAnim - 3) / 0) * (14.36611-(-15.8477))); + zz = -33.62629 + (((tickAnim - 3) / 0) * (18.52093-(-33.62629))); + } + else { + xx = 0; + yy = 0; + zz = 0; + } + this.setRotateAngle(hindwingleft, hindwingleft.rotateAngleX + (float) Math.toRadians(xx), hindwingleft.rotateAngleY + (float) Math.toRadians(yy), hindwingleft.rotateAngleZ + (float) Math.toRadians(zz)); + + } + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity e) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, e); + + + } +} diff --git a/src/main/java/net/lepidodendron/entity/render/RenderHandler.java b/src/main/java/net/lepidodendron/entity/render/RenderHandler.java index 46020eba2b..bae8c522c1 100644 --- a/src/main/java/net/lepidodendron/entity/render/RenderHandler.java +++ b/src/main/java/net/lepidodendron/entity/render/RenderHandler.java @@ -2148,12 +2148,6 @@ public Render createRenderFor(Rend return new RenderProtozygoptera(manager); } }); - RenderingRegistry.registerEntityRenderingHandler(EntityPrehistoricFloraPalaeontinid.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) { - return new RenderPalaeontinid(manager); - } - }); RenderingRegistry.registerEntityRenderingHandler(EntityPrehistoricFloraCasineria.class, new IRenderFactory() { @Override public Render createRenderFor(RenderManager manager) { @@ -4373,12 +4367,6 @@ public Render createRenderFor(Rende return new RenderTrachymetopon(manager); } }); - RenderingRegistry.registerEntityRenderingHandler(EntityPrehistoricFloraDaohugoucossus.class, new IRenderFactory() { - @Override - public Render createRenderFor(RenderManager manager) { - return new RenderDaohugoucossus(manager); - } - }); RenderingRegistry.registerEntityRenderingHandler(EntityPrehistoricFloraPanacanthocaris.class, new IRenderFactory() { @Override public Render createRenderFor(RenderManager manager) { @@ -9179,6 +9167,12 @@ public Render createRenderFor(Render return new RenderUmoonasaurus(manager); } }); + RenderingRegistry.registerEntityRenderingHandler(EntityPrehistoricFloraPalaeontinid.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderPalaeontinid(manager); + } + }); diff --git a/src/main/java/net/lepidodendron/entity/render/entity/RenderDaohugoucossus.java b/src/main/java/net/lepidodendron/entity/render/entity/RenderDaohugoucossus.java index 79b73af919..40c4f2e38c 100644 --- a/src/main/java/net/lepidodendron/entity/render/entity/RenderDaohugoucossus.java +++ b/src/main/java/net/lepidodendron/entity/render/entity/RenderDaohugoucossus.java @@ -1,64 +1,64 @@ -package net.lepidodendron.entity.render.entity; - -import net.lepidodendron.LepidodendronMod; -import net.lepidodendron.entity.EntityPrehistoricFloraDaohugoucossus; -import net.lepidodendron.entity.model.entity.ModelDaohugoucossus; -import net.lepidodendron.entity.render.RenderLivingBaseWithBook; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.util.ResourceLocation; - -public class RenderDaohugoucossus extends RenderLivingBaseWithBook { - public static final ResourceLocation TEXTURE = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/Daohugoucossus.png"); - - public static float getScaler() {return 0.2f;} - - public RenderDaohugoucossus(RenderManager mgr) { - super(mgr, new ModelDaohugoucossus(), 0.0f); - } - - @Override - public ResourceLocation getEntityTexture(EntityPrehistoricFloraDaohugoucossus entity) { - return RenderDaohugoucossus.TEXTURE; - } - - @Override - protected void applyRotations(EntityPrehistoricFloraDaohugoucossus entityLiving, float ageInTicks, float rotationYaw, float partialTicks) { - super.applyRotations(entityLiving, ageInTicks, rotationYaw, partialTicks); - float offset = 0.14F; - switch (entityLiving.getAttachmentFacing()) { - case DOWN: - default: - break; - case EAST: - GlStateManager.translate(offset, 0.1F, 0.0F); - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F); - break; - case WEST: - GlStateManager.translate(-offset, 0.1F, 0.0F); - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate(-90.0F, 0.0F, 0.0F, 1.0F); - break; - case NORTH: - GlStateManager.translate(0.0F, 0.1F, -offset); - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - break; - case SOUTH: - GlStateManager.translate(0.0F, 0.1F, offset); - GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); - GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); - break; - case UP: - GlStateManager.translate(0.0F, 0.5F, 0.0F); - GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F); - } - } - - @Override - protected void preRenderCallback(EntityPrehistoricFloraDaohugoucossus entity, float f) { - float scale = getScaler(); - GlStateManager.scale(scale, scale, scale); - } - -} \ No newline at end of file +//package net.lepidodendron.entity.render.entity; +// +//import net.lepidodendron.LepidodendronMod; +//import net.lepidodendron.entity.EntityPrehistoricFloraDaohugoucossus; +//import net.lepidodendron.entity.model.entity.ModelDaohugoucossus; +//import net.lepidodendron.entity.render.RenderLivingBaseWithBook; +//import net.minecraft.client.renderer.GlStateManager; +//import net.minecraft.client.renderer.entity.RenderManager; +//import net.minecraft.util.ResourceLocation; +// +//public class RenderDaohugoucossus extends RenderLivingBaseWithBook { +// public static final ResourceLocation TEXTURE = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/Daohugoucossus.png"); +// +// public static float getScaler() {return 0.2f;} +// +// public RenderDaohugoucossus(RenderManager mgr) { +// super(mgr, new ModelDaohugoucossus(), 0.0f); +// } +// +// @Override +// public ResourceLocation getEntityTexture(EntityPrehistoricFloraDaohugoucossus entity) { +// return RenderDaohugoucossus.TEXTURE; +// } +// +// @Override +// protected void applyRotations(EntityPrehistoricFloraDaohugoucossus entityLiving, float ageInTicks, float rotationYaw, float partialTicks) { +// super.applyRotations(entityLiving, ageInTicks, rotationYaw, partialTicks); +// float offset = 0.14F; +// switch (entityLiving.getAttachmentFacing()) { +// case DOWN: +// default: +// break; +// case EAST: +// GlStateManager.translate(offset, 0.1F, 0.0F); +// GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); +// GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F); +// break; +// case WEST: +// GlStateManager.translate(-offset, 0.1F, 0.0F); +// GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); +// GlStateManager.rotate(-90.0F, 0.0F, 0.0F, 1.0F); +// break; +// case NORTH: +// GlStateManager.translate(0.0F, 0.1F, -offset); +// GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); +// break; +// case SOUTH: +// GlStateManager.translate(0.0F, 0.1F, offset); +// GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); +// GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); +// break; +// case UP: +// GlStateManager.translate(0.0F, 0.5F, 0.0F); +// GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F); +// } +// } +// +// @Override +// protected void preRenderCallback(EntityPrehistoricFloraDaohugoucossus entity, float f) { +// float scale = getScaler(); +// GlStateManager.scale(scale, scale, scale); +// } +// +//} \ No newline at end of file diff --git a/src/main/java/net/lepidodendron/entity/render/entity/RenderPalaeontinid.java b/src/main/java/net/lepidodendron/entity/render/entity/RenderPalaeontinid.java index b75e30f5e1..99c97842be 100644 --- a/src/main/java/net/lepidodendron/entity/render/entity/RenderPalaeontinid.java +++ b/src/main/java/net/lepidodendron/entity/render/entity/RenderPalaeontinid.java @@ -2,26 +2,102 @@ import net.lepidodendron.LepidodendronMod; import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; -import net.lepidodendron.entity.model.entity.ModelPalaeontinid; -import net.lepidodendron.entity.render.RenderLivingBaseWithBook; +import net.lepidodendron.entity.model.entity.*; +import net.lepidodendron.entity.render.RenderLivingBaseVariantModels; +import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; -public class RenderPalaeontinid extends RenderLivingBaseWithBook { - public static final ResourceLocation TEXTURE = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid.png"); +public class RenderPalaeontinid extends RenderLivingBaseVariantModels { + public static final ResourceLocation TEXTURE_AUSTROPROSBOLOIDES = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_austroprosboloides.png"); + public static final ResourceLocation TEXTURE_FLETCHERIANA = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_fletcheriana.png"); + public static final ResourceLocation TEXTURE_PAPILIONTINA = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_papiliontina.png"); + public static final ResourceLocation TEXTURE_EOCICADA = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_eocicada.png"); + public static final ResourceLocation TEXTURE_TALBRAGAROCOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_talbragarocossus.png"); + public static final ResourceLocation TEXTURE_MIRACOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_miracossus.png"); + public static final ResourceLocation TEXTURE_ILERDOCOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_ilerdocossus.png"); + public static final ResourceLocation TEXTURE_BAEOCOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_baeocossus.png"); + public static final ResourceLocation TEXTURE_COLOSSOCOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_colossocossus.png"); + public static final ResourceLocation TEXTURE_PACHYPSYCHE = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_pachypsyche.png"); + public static final ResourceLocation TEXTURE_DAOHUGOUCOSSUS = new ResourceLocation(LepidodendronMod.MODID + ":textures/entities/palaeontinid_daohugoucossus.png"); - public static float getScaler() {return 0.2f;} public RenderPalaeontinid(RenderManager mgr) { - super(mgr, new ModelPalaeontinid(), 0.0f); + super(mgr, new ModelPalaeontinid(), new ModelBase[]{new ModelPalaeontinid(), new ModelPalaeontinidLong(), new ModelPalaeontinidShort()},0.0f); } + @Override public ResourceLocation getEntityTexture(EntityPrehistoricFloraPalaeontinid entity) { - return RenderPalaeontinid.TEXTURE; + switch (entity.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return TEXTURE_AUSTROPROSBOLOIDES; + + case FLETCHERIANA: + return TEXTURE_FLETCHERIANA; + + case PAPILIONTINA: + return TEXTURE_PAPILIONTINA; + + case EOCICADA: + return TEXTURE_EOCICADA; + + case TALBRAGAROCOSSUS: + return TEXTURE_TALBRAGAROCOSSUS; + + case MIRACOSSUS: + return TEXTURE_MIRACOSSUS; + + case ILERDOCOSSUS: + return TEXTURE_ILERDOCOSSUS; + + case BAEOCOSSUS: + return TEXTURE_BAEOCOSSUS; + + case COLOSSOCOSSUS: + return TEXTURE_COLOSSOCOSSUS; + + case PACHYPSYCHE: + return TEXTURE_PACHYPSYCHE; + + case DAOHUGOUCOSSUS: + return TEXTURE_DAOHUGOUCOSSUS; + } + } + + + @Override + public ModelBase getModelFromArray(EntityPrehistoricFloraPalaeontinid entity) { + switch (entity.getPNType()) { + case AUSTROPROSBOLOIDES: default: + return this.mainModelArray[0]; + case FLETCHERIANA: + return this.mainModelArray[1]; + case PAPILIONTINA: + return this.mainModelArray[2]; + case EOCICADA: + return this.mainModelArray[2]; + case TALBRAGAROCOSSUS: + return this.mainModelArray[1]; + case MIRACOSSUS: + return this.mainModelArray[1]; + case ILERDOCOSSUS: + return this.mainModelArray[1]; + case BAEOCOSSUS: + return this.mainModelArray[2]; + case COLOSSOCOSSUS: + return this.mainModelArray[2]; + case PACHYPSYCHE: + return this.mainModelArray[2]; + case DAOHUGOUCOSSUS: + return this.mainModelArray[1]; + + + } } + @Override protected void applyRotations(EntityPrehistoricFloraPalaeontinid entityLiving, float ageInTicks, float rotationYaw, float partialTicks) { super.applyRotations(entityLiving, ageInTicks, rotationYaw, partialTicks); @@ -30,33 +106,120 @@ protected void applyRotations(EntityPrehistoricFloraPalaeontinid entityLiving, f default: break; case EAST: - GlStateManager.translate(0.25F, 0.05F, 0.0F); + GlStateManager.translate(0.1F, 0.1F, 0.0F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(90.0F, 0.0F, 0.0F, 1.0F); break; case WEST: - GlStateManager.translate(-0.25F, 0.05F, 0.0F); + GlStateManager.translate(-0.1F, 0.1F, 0.0F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(-90.0F, 0.0F, 0.0F, 1.0F); break; case NORTH: - GlStateManager.translate(0.0F, 0.05F, -0.25F); + GlStateManager.translate(0.0F, 0.1F, -0.1F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); break; case SOUTH: - GlStateManager.translate(0.0F, 0.05F, 0.25F); + GlStateManager.translate(0.0F, 0.1F, 0.1F); GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); break; case UP: - GlStateManager.translate(0.0F, 0.5F, 0.0F); + GlStateManager.translate(0.0F, 0.2F, 0.0F); GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F); } } + public static float getScaler(EntityPrehistoricFloraPalaeontinid.Type variant) { + switch (variant) { + case AUSTROPROSBOLOIDES: + default: + return 0.2F; + case FLETCHERIANA: + return 0.2F; + + case PAPILIONTINA: + return 0.2F; + + case EOCICADA: + return 0.2F; + + case TALBRAGAROCOSSUS: + return 0.2F; + + case MIRACOSSUS: + return 0.2F; + + case ILERDOCOSSUS: + return 0.2F; + + case BAEOCOSSUS: + return 0.2F; + + case COLOSSOCOSSUS: + return 0.2F; + + case PACHYPSYCHE: + return 0.2F; + + case DAOHUGOUCOSSUS: + return 0.2F; + } + } @Override protected void preRenderCallback(EntityPrehistoricFloraPalaeontinid entity, float f) { - float scale = getScaler(); + float scaler = 0.2F; + switch (entity.getPNType()) { + case AUSTROPROSBOLOIDES: default: + scaler = 0.12F; + break; + + case FLETCHERIANA: + scaler = 0.3F; + break; + + case PAPILIONTINA: + scaler = 0.2F; + break; + + case EOCICADA: + scaler = 0.25F; + break; + + case TALBRAGAROCOSSUS: + scaler = 0.19F; + break; + + case MIRACOSSUS: + scaler = 0.16F; + break; + + case ILERDOCOSSUS: + scaler = 0.26F; + break; + + case BAEOCOSSUS: + scaler = 0.16F; + break; + + case COLOSSOCOSSUS: + scaler = 0.26F; + break; + + case PACHYPSYCHE: + scaler = 0.14F; + break; + + case DAOHUGOUCOSSUS: + scaler = 0.17F; + break; + + + } + float scale = 1.0F * scaler; +// if (entity.world.getBlockState(entity.getPosition()).getBlock() == BlockGlassJar.block) { +// scale = Math.min() 0.8F * scaler; +// } GlStateManager.scale(scale, scale, scale); } diff --git a/src/main/java/net/lepidodendron/item/ItemFossilClean.java b/src/main/java/net/lepidodendron/item/ItemFossilClean.java index a2c5971c10..c1273ce9f2 100644 --- a/src/main/java/net/lepidodendron/item/ItemFossilClean.java +++ b/src/main/java/net/lepidodendron/item/ItemFossilClean.java @@ -249,6 +249,8 @@ public void registerModels(ModelRegistryEvent event) { new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_ilerdocossus_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_baeocossus_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_colossocossus_clean", "inventory"), + new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_daohugoucossus_clean", "inventory"), + new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_pachypsyche_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_eoproscopia_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_protophasma_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_juramantophasma_clean", "inventory"), @@ -1053,7 +1055,6 @@ public void registerModels(ModelRegistryEvent event) { new ModelResourceLocation("lepidodendron:fossils/fossil_thalassiodracon_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_bobosaurus_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_megasecoptera_sylvohymen_clean", "inventory"), - new ModelResourceLocation("lepidodendron:fossils/fossil_daohugoucossus_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_meganeurites_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_trachymetopon_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_panacanthocaris_clean", "inventory"), @@ -1990,7 +1991,6 @@ public void registerModels(ModelRegistryEvent event) { new ModelResourceLocation("lepidodendron:fossils/fossil_palaeojelly3_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_palaeojelly4_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_palaeoniscum_clean", "inventory"), - new ModelResourceLocation("lepidodendron:fossils/fossil_palaeontinid_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_palaeostachya_sapling_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_pambikalbae_clean", "inventory"), new ModelResourceLocation("lepidodendron:fossils/fossil_pandan_sapling_clean", "inventory"), diff --git a/src/main/java/net/lepidodendron/item/ItemPhialFull.java b/src/main/java/net/lepidodendron/item/ItemPhialFull.java index 9c7ad21781..d470bb29f2 100644 --- a/src/main/java/net/lepidodendron/item/ItemPhialFull.java +++ b/src/main/java/net/lepidodendron/item/ItemPhialFull.java @@ -72,7 +72,6 @@ public void registerModels(ModelRegistryEvent event) { new ModelResourceLocation("lepidodendron:entities/phial_eggs_cotylorhynchus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_cobelodus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_crassigyrinus", "inventory"), - new ModelResourceLocation("lepidodendron:entities/phial_eggs_daohugoucossus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_dasyceps", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_diadectes", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_diplocaulus", "inventory"), @@ -144,7 +143,6 @@ public void registerModels(ModelRegistryEvent event) { new ModelResourceLocation("lepidodendron:entities/phial_eggs_palaeodictyoptera_nymph_psychroptilus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_palaeodictyoptera_nymph_sinodunbaria", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_palaeodictyoptera_nymph_stenodictya", "inventory"), - new ModelResourceLocation("lepidodendron:entities/phial_eggs_palaeontinid", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_pantylus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_parhybodus", "inventory"), new ModelResourceLocation("lepidodendron:entities/phial_eggs_parmastega", "inventory"), diff --git a/src/main/java/net/lepidodendron/item/entities/ItemDaohugoucossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemDaohugoucossusRaw.java index 866bfbc18f..c627bfbc6c 100644 --- a/src/main/java/net/lepidodendron/item/entities/ItemDaohugoucossusRaw.java +++ b/src/main/java/net/lepidodendron/item/entities/ItemDaohugoucossusRaw.java @@ -1,68 +1,68 @@ - -package net.lepidodendron.item.entities; - -import net.lepidodendron.ElementsLepidodendronMod; -import net.lepidodendron.LepidodendronSorter; -import net.lepidodendron.creativetab.TabLepidodendronMobile; -import net.lepidodendron.item.ItemGlassCaseDisplayItem; -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.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; - -@ElementsLepidodendronMod.ModElement.Tag -public class ItemDaohugoucossusRaw extends ElementsLepidodendronMod.ModElement { - @GameRegistry.ObjectHolder("lepidodendron:daohugoucossus_raw") - public static final Item block = null; - public ItemDaohugoucossusRaw(ElementsLepidodendronMod instance) { - super(instance, LepidodendronSorter.daohugoucossus_raw); - } - - @Override - public void initElements() { - elements.items.add(() -> new ItemFoodCustom()); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels(ModelRegistryEvent event) { - ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/daohugoucossus_raw", "inventory")); - } - - @Override - public void init(FMLInitializationEvent event) { - super.init(event); - OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_daohugoucossus", ItemDaohugoucossusRaw.block); - OreDictionary.registerOre("pnfurnaceBug", ItemDaohugoucossusRaw.block); - OreDictionary.registerOre("pndietBug", ItemDaohugoucossusRaw.block); - } - - public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { - public ItemFoodCustom() { - super(1, 0.05f, false); - setTranslationKey("pf_daohugoucossus_raw"); - setRegistryName("daohugoucossus_raw"); - setCreativeTab(TabLepidodendronMobile.tab); - setMaxStackSize(64); - } - - @Nullable - @Override - public String getMobStr() { - return "lepidodendron:prehistoric_flora_daohugoucossus"; - } - - @Nullable - @Override - public String getVariantStr() { - return null; - } - } -} +// +//package net.lepidodendron.item.entities; +// +//import net.lepidodendron.ElementsLepidodendronMod; +//import net.lepidodendron.LepidodendronSorter; +//import net.lepidodendron.creativetab.TabLepidodendronMobile; +//import net.lepidodendron.item.ItemGlassCaseDisplayItem; +//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.event.FMLInitializationEvent; +//import net.minecraftforge.fml.common.registry.GameRegistry; +//import net.minecraftforge.fml.relauncher.Side; +//import net.minecraftforge.fml.relauncher.SideOnly; +//import net.minecraftforge.oredict.OreDictionary; +// +//import javax.annotation.Nullable; +// +//@ElementsLepidodendronMod.ModElement.Tag +//public class ItemDaohugoucossusRaw extends ElementsLepidodendronMod.ModElement { +// @GameRegistry.ObjectHolder("lepidodendron:daohugoucossus_raw") +// public static final Item block = null; +// public ItemDaohugoucossusRaw(ElementsLepidodendronMod instance) { +// super(instance, LepidodendronSorter.daohugoucossus_raw); +// } +// +// @Override +// public void initElements() { +// elements.items.add(() -> new ItemFoodCustom()); +// } +// +// @SideOnly(Side.CLIENT) +// @Override +// public void registerModels(ModelRegistryEvent event) { +// ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/daohugoucossus_raw", "inventory")); +// } +// +// @Override +// public void init(FMLInitializationEvent event) { +// super.init(event); +// OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_daohugoucossus", ItemDaohugoucossusRaw.block); +// OreDictionary.registerOre("pnfurnaceBug", ItemDaohugoucossusRaw.block); +// OreDictionary.registerOre("pndietBug", ItemDaohugoucossusRaw.block); +// } +// +// public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { +// public ItemFoodCustom() { +// super(1, 0.05f, false); +// setTranslationKey("pf_daohugoucossus_raw"); +// setRegistryName("daohugoucossus_raw"); +// setCreativeTab(TabLepidodendronMobile.tab); +// setMaxStackSize(64); +// } +// +// @Nullable +// @Override +// public String getMobStr() { +// return "lepidodendron:prehistoric_flora_daohugoucossus"; +// } +// +// @Nullable +// @Override +// public String getVariantStr() { +// return null; +// } +// } +//} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidAustroprosboloidesRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidAustroprosboloidesRaw.java new file mode 100644 index 0000000000..1f0151ea4c --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidAustroprosboloidesRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidAustroprosboloidesRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_austroprosboloides_raw") + public static final Item block = null; + public ItemPalaeontinidAustroprosboloidesRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.austroprosboloides_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_austroprosboloides_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@austroprosboloides", ItemPalaeontinidAustroprosboloidesRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidAustroprosboloidesRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidAustroprosboloidesRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_austroprosboloides_raw"); + setRegistryName("palaeontinid_austroprosboloides_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "austroprosboloides"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidBaeocossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidBaeocossusRaw.java new file mode 100644 index 0000000000..f20fb03e4f --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidBaeocossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidBaeocossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_baeocossus_raw") + public static final Item block = null; + public ItemPalaeontinidBaeocossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.baeocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_baeocossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@baeocossus", ItemPalaeontinidBaeocossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidBaeocossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidBaeocossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_baeocossus_raw"); + setRegistryName("palaeontinid_baeocossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "baeocossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidColossocossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidColossocossusRaw.java new file mode 100644 index 0000000000..a89a220d67 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidColossocossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidColossocossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_colossocossus_raw") + public static final Item block = null; + public ItemPalaeontinidColossocossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.colossocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_colossocossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@colossocossus", ItemPalaeontinidColossocossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidColossocossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidColossocossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_colossocossus_raw"); + setRegistryName("palaeontinid_colossocossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "colossocossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidDaohugoucossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidDaohugoucossusRaw.java new file mode 100644 index 0000000000..761ec2ae81 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidDaohugoucossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidDaohugoucossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_daohugoucossus_raw") + public static final Item block = null; + public ItemPalaeontinidDaohugoucossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.daohugoucossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_daohugoucossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@daohugoucossus", ItemPalaeontinidDaohugoucossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidDaohugoucossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidDaohugoucossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_daohugoucossus_raw"); + setRegistryName("palaeontinid_daohugoucossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "daohugoucossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidEocicadaRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidEocicadaRaw.java new file mode 100644 index 0000000000..140b61f778 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidEocicadaRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidEocicadaRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_eocicada_raw") + public static final Item block = null; + public ItemPalaeontinidEocicadaRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.eocicada_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_eocicada_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@eocicada", ItemPalaeontinidEocicadaRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidEocicadaRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidEocicadaRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_eocicada_raw"); + setRegistryName("palaeontinid_eocicada_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "eocicada"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidFletcherianaRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidFletcherianaRaw.java new file mode 100644 index 0000000000..74f8474453 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidFletcherianaRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidFletcherianaRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_fletcheriana_raw") + public static final Item block = null; + public ItemPalaeontinidFletcherianaRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.fletcheriana_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_fletcheriana_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@fletcheriana", ItemPalaeontinidFletcherianaRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidFletcherianaRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidFletcherianaRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_fletcheriana_raw"); + setRegistryName("palaeontinid_fletcheriana_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "fletcheriana"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidIlerdocossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidIlerdocossusRaw.java new file mode 100644 index 0000000000..c6039a4be0 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidIlerdocossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidIlerdocossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_ilerdocossus_raw") + public static final Item block = null; + public ItemPalaeontinidIlerdocossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.ilerdocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_ilerdocossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@ilerdocossus", ItemPalaeontinidIlerdocossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidIlerdocossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidIlerdocossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_ilerdocossus_raw"); + setRegistryName("palaeontinid_ilerdocossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "ilerdocossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidMiracossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidMiracossusRaw.java new file mode 100644 index 0000000000..c3bed41b24 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidMiracossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidMiracossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_miracossus_raw") + public static final Item block = null; + public ItemPalaeontinidMiracossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.miracossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_miracossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@miracossus", ItemPalaeontinidMiracossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidMiracossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidMiracossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_miracossus_raw"); + setRegistryName("palaeontinid_miracossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "miracossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPachypsycheRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPachypsycheRaw.java new file mode 100644 index 0000000000..cbcc84e09b --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPachypsycheRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidPachypsycheRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_pachypsyche_raw") + public static final Item block = null; + public ItemPalaeontinidPachypsycheRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.pachypsyche_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_pachypsyche_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@pachypsyche", ItemPalaeontinidPachypsycheRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidPachypsycheRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidPachypsycheRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_pachypsyche_raw"); + setRegistryName("palaeontinid_pachypsyche_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "pachypsyche"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPapiliontinaRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPapiliontinaRaw.java new file mode 100644 index 0000000000..49569f4805 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidPapiliontinaRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidPapiliontinaRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_papiliontina_raw") + public static final Item block = null; + public ItemPalaeontinidPapiliontinaRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.papiliontina_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_papiliontina_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@papiliontina", ItemPalaeontinidPapiliontinaRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidPapiliontinaRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidPapiliontinaRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_papiliontina_raw"); + setRegistryName("palaeontinid_papiliontina_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "papiliontina"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidRaw.java index db4be3eb83..2910c60146 100644 --- a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidRaw.java +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidRaw.java @@ -1,68 +1,68 @@ - -package net.lepidodendron.item.entities; - -import net.lepidodendron.ElementsLepidodendronMod; -import net.lepidodendron.LepidodendronSorter; -import net.lepidodendron.creativetab.TabLepidodendronMobile; -import net.lepidodendron.item.ItemGlassCaseDisplayItem; -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.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; - -@ElementsLepidodendronMod.ModElement.Tag -public class ItemPalaeontinidRaw extends ElementsLepidodendronMod.ModElement { - @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_raw") - public static final Item block = null; - public ItemPalaeontinidRaw(ElementsLepidodendronMod instance) { - super(instance, LepidodendronSorter.palaeontinid_raw); - } - - @Override - public void initElements() { - elements.items.add(() -> new ItemFoodCustom()); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels(ModelRegistryEvent event) { - ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_raw", "inventory")); - } - - @Override - public void init(FMLInitializationEvent event) { - super.init(event); - OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid", ItemPalaeontinidRaw.block); - OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidRaw.block); - OreDictionary.registerOre("pndietBug", ItemPalaeontinidRaw.block); - } - - public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { - public ItemFoodCustom() { - super(1, 0.05f, false); - setTranslationKey("pf_palaeontinid_raw"); - setRegistryName("palaeontinid_raw"); - setCreativeTab(TabLepidodendronMobile.tab); - setMaxStackSize(64); - } - - @Nullable - @Override - public String getMobStr() { - return "lepidodendron:prehistoric_flora_palaeontinid"; - } - - @Nullable - @Override - public String getVariantStr() { - return null; - } - } -} +// +//package net.lepidodendron.item.entities; +// +//import net.lepidodendron.ElementsLepidodendronMod; +//import net.lepidodendron.LepidodendronSorter; +//import net.lepidodendron.creativetab.TabLepidodendronMobile; +//import net.lepidodendron.item.ItemGlassCaseDisplayItem; +//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.event.FMLInitializationEvent; +//import net.minecraftforge.fml.common.registry.GameRegistry; +//import net.minecraftforge.fml.relauncher.Side; +//import net.minecraftforge.fml.relauncher.SideOnly; +//import net.minecraftforge.oredict.OreDictionary; +// +//import javax.annotation.Nullable; +// +//@ElementsLepidodendronMod.ModElement.Tag +//public class ItemPalaeontinidRaw extends ElementsLepidodendronMod.ModElement { +// @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_raw") +// public static final Item block = null; +// public ItemPalaeontinidRaw(ElementsLepidodendronMod instance) { +// super(instance, LepidodendronSorter.palaeontinid_raw); +// } +// +// @Override +// public void initElements() { +// elements.items.add(() -> new ItemFoodCustom()); +// } +// +// @SideOnly(Side.CLIENT) +// @Override +// public void registerModels(ModelRegistryEvent event) { +// ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_raw", "inventory")); +// } +// +// @Override +// public void init(FMLInitializationEvent event) { +// super.init(event); +// OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid", ItemPalaeontinidRaw.block); +// OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidRaw.block); +// OreDictionary.registerOre("pndietBug", ItemPalaeontinidRaw.block); +// } +// +// public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { +// public ItemFoodCustom() { +// super(1, 0.05f, false); +// setTranslationKey("pf_palaeontinid_raw"); +// setRegistryName("palaeontinid_raw"); +// setCreativeTab(TabLepidodendronMobile.tab); +// setMaxStackSize(64); +// } +// +// @Nullable +// @Override +// public String getMobStr() { +// return "lepidodendron:prehistoric_flora_palaeontinid"; +// } +// +// @Nullable +// @Override +// public String getVariantStr() { +// return null; +// } +// } +//} diff --git a/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidTalbragarocossusRaw.java b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidTalbragarocossusRaw.java new file mode 100644 index 0000000000..f19439c1f3 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/ItemPalaeontinidTalbragarocossusRaw.java @@ -0,0 +1,68 @@ + +package net.lepidodendron.item.entities; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.creativetab.TabLepidodendronMobile; +import net.lepidodendron.item.ItemGlassCaseDisplayItem; +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.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemPalaeontinidTalbragarocossusRaw extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:palaeontinid_talbragarocossus_raw") + public static final Item block = null; + public ItemPalaeontinidTalbragarocossusRaw(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.talbragarocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemFoodCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/palaeontinid_talbragarocossus_raw", "inventory")); + } + + @Override + public void init(FMLInitializationEvent event) { + super.init(event); + OreDictionary.registerOre("mobdnaPNlepidodendron:prehistoric_flora_palaeontinid@talbragarocossus", ItemPalaeontinidTalbragarocossusRaw.block); + OreDictionary.registerOre("pnfurnaceBug", ItemPalaeontinidTalbragarocossusRaw.block); + OreDictionary.registerOre("pndietBug", ItemPalaeontinidTalbragarocossusRaw.block); + } + + public static class ItemFoodCustom extends ItemGlassCaseDisplayItem { + public ItemFoodCustom() { + super(); + setTranslationKey("pf_palaeontinid_talbragarocossus_raw"); + setRegistryName("palaeontinid_talbragarocossus_raw"); + setCreativeTab(TabLepidodendronMobile.tab); + setMaxStackSize(64); + } + + @Nullable + @Override + public String getMobStr() { + return "lepidodendron:prehistoric_flora_palaeontinid"; + } + + @Nullable + @Override + public String getVariantStr() { + return "talbragarocossus"; + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidAustroprosboloides.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidAustroprosboloides.java new file mode 100644 index 0000000000..7c8914027b --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidAustroprosboloides.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidAustroprosboloides extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_austroprosboloides") + public static final Item block = null; + public ItemSpawnEggPalaeontinidAustroprosboloides(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.austroprosboloides_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_austroprosboloides", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_austroprosboloides"); + setRegistryName("spawn_egg_palaeontinid_austroprosboloides"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "austroprosboloides"; + } + + @Override + public int eggPrimaryColour() { + return -3949945; + } + + @Override + public int eggSecondaryColour() { + return -5937626; + } + + + @Override + public String getPeriod() { + return "Permian"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidBaeocossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidBaeocossus.java new file mode 100644 index 0000000000..deec291638 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidBaeocossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidBaeocossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_baeocossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidBaeocossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.baeocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_baeocossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_baeocossus"); + setRegistryName("spawn_egg_palaeontinid_baeocossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "baeocossus"; + } + + @Override + public int eggPrimaryColour() { + return -12175839; + } + + @Override + public int eggSecondaryColour() { + return -5204363; + } + + + @Override + public String getPeriod() { + return "Early Cretaceous"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidColossocossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidColossocossus.java new file mode 100644 index 0000000000..e64e7bf89d --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidColossocossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidColossocossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_colossocossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidColossocossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.colossocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_colossocossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_colossocossus"); + setRegistryName("spawn_egg_palaeontinid_colossocossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "colossocossus"; + } + + @Override + public int eggPrimaryColour() { + return -4806030; + } + + @Override + public int eggSecondaryColour() { + return -4891594; + } + + + @Override + public String getPeriod() { + return "Early Cretaceous"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidDaohugoucossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidDaohugoucossus.java new file mode 100644 index 0000000000..e1e22016ba --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidDaohugoucossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidDaohugoucossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_daohugoucossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidDaohugoucossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.daohugoucossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_daohugoucossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_daohugoucossus"); + setRegistryName("spawn_egg_palaeontinid_daohugoucossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "daohugoucossus"; + } + + @Override + public int eggPrimaryColour() { + return -15578831; + } + + @Override + public int eggSecondaryColour() { + return -3422527; + } + + + @Override + public String getPeriod() { + return "Jurassic"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidEocicada.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidEocicada.java new file mode 100644 index 0000000000..d56b387f3c --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidEocicada.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidEocicada extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_eocicada") + public static final Item block = null; + public ItemSpawnEggPalaeontinidEocicada(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.eocicada_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_eocicada", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_eocicada"); + setRegistryName("spawn_egg_palaeontinid_eocicada"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "eocicada"; + } + + @Override + public int eggPrimaryColour() { + return -1579562; + } + + @Override + public int eggSecondaryColour() { + return -13422035; + } + + + @Override + public String getPeriod() { + return "Jurassic"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidFletcheriana.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidFletcheriana.java new file mode 100644 index 0000000000..5382b44e67 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidFletcheriana.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidFletcheriana extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_fletcheriana") + public static final Item block = null; + public ItemSpawnEggPalaeontinidFletcheriana(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.fletcheriana_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_fletcheriana", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_fletcheriana"); + setRegistryName("spawn_egg_palaeontinid_fletcheriana"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "fletcheriana"; + } + + @Override + public int eggPrimaryColour() { + return -13234426; + } + + @Override + public int eggSecondaryColour() { + return -2447219; + } + + + @Override + public String getPeriod() { + return "Triassic"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidIlerdocossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidIlerdocossus.java new file mode 100644 index 0000000000..37a65a7d8f --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidIlerdocossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidIlerdocossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_ilerdocossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidIlerdocossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.ilerdocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_ilerdocossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_ilerdocossus"); + setRegistryName("spawn_egg_palaeontinid_ilerdocossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "ilerdocossus"; + } + + @Override + public int eggPrimaryColour() { + return -10012904; + } + + @Override + public int eggSecondaryColour() { + return -2895468; + } + + + @Override + public String getPeriod() { + return "Early Cretaceous"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidMiracossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidMiracossus.java new file mode 100644 index 0000000000..1850e42959 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidMiracossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidMiracossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_miracossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidMiracossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.miracossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_miracossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_miracossus"); + setRegistryName("spawn_egg_palaeontinid_miracossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "miracossus"; + } + + @Override + public int eggPrimaryColour() { + return -11253722; + } + + @Override + public int eggSecondaryColour() { + return -3291990; + } + + + @Override + public String getPeriod() { + return "Early Cretaceous"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPachypsyche.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPachypsyche.java new file mode 100644 index 0000000000..40ee07b133 --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPachypsyche.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidPachypsyche extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_pachypsyche") + public static final Item block = null; + public ItemSpawnEggPalaeontinidPachypsyche(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.pachypsyche_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_pachypsyche", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_pachypsyche"); + setRegistryName("spawn_egg_palaeontinid_pachypsyche"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "pachypsyche"; + } + + @Override + public int eggPrimaryColour() { + return -5988724; + } + + @Override + public int eggSecondaryColour() { + return -12895691; + } + + + @Override + public String getPeriod() { + return "Early Cretaceous"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPapiliontina.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPapiliontina.java new file mode 100644 index 0000000000..e12506010f --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidPapiliontina.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidPapiliontina extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_papiliontina") + public static final Item block = null; + public ItemSpawnEggPalaeontinidPapiliontina(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.papiliontina_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_papiliontina", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_papiliontina"); + setRegistryName("spawn_egg_palaeontinid_papiliontina"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "papiliontina"; + } + + @Override + public int eggPrimaryColour() { + return -12110035; + } + + @Override + public int eggSecondaryColour() { + return -3766417; + } + + + @Override + public String getPeriod() { + return "Triassic"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidTalbragarocossus.java b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidTalbragarocossus.java new file mode 100644 index 0000000000..f5902e781e --- /dev/null +++ b/src/main/java/net/lepidodendron/item/entities/spawneggs/ItemSpawnEggPalaeontinidTalbragarocossus.java @@ -0,0 +1,98 @@ + +package net.lepidodendron.item.entities.spawneggs; + +import net.lepidodendron.ElementsLepidodendronMod; +import net.lepidodendron.LepidodendronSorter; +import net.lepidodendron.entity.EntityPrehistoricFloraPalaeontinid; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; + +@ElementsLepidodendronMod.ModElement.Tag +public class ItemSpawnEggPalaeontinidTalbragarocossus extends ElementsLepidodendronMod.ModElement { + @GameRegistry.ObjectHolder("lepidodendron:spawn_egg_palaeontinid_talbragarocossus") + public static final Item block = null; + public ItemSpawnEggPalaeontinidTalbragarocossus(ElementsLepidodendronMod instance) { + super(instance, LepidodendronSorter.talbragarocossus_raw); + } + + @Override + public void initElements() { + elements.items.add(() -> new ItemCustom()); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModels(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(block, 0, new ModelResourceLocation("lepidodendron:entities/spawneggs/spawn_egg_palaeontinid_talbragarocossus", "inventory")); + } + + public static class ItemCustom extends ItemPNSpawnEgg { + String variant; + public ItemCustom() { + setTranslationKey("pf_spawn_egg_palaeontinid_talbragarocossus"); + setRegistryName("spawn_egg_palaeontinid_talbragarocossus"); + setCreativeTab(CreativeTabs.MISC); + setMaxStackSize(64); + this.variant = "talbragarocossus"; + } + + @Override + public int eggPrimaryColour() { + return -9018042; + } + + @Override + public int eggSecondaryColour() { + return -13554905; + } + + + @Override + public String getPeriod() { + return "Jurassic"; + } + + //@Override + //public String getHabitat() { + // return "Terrestrial"; + //} + + @Override + @Nullable + public Entity spawnPNCreature(World worldIn, @Nullable ResourceLocation entityID, double x, double y, double z) + { + Entity entity = EntityList.createEntityByIDFromName(new ResourceLocation("lepidodendron:prehistoric_flora_palaeontinid"), worldIn); + + if (entity instanceof EntityLiving) + { + EntityLiving entityliving = (EntityLiving)entity; + entity.setLocationAndAngles(x, y, z, MathHelper.wrapDegrees(worldIn.rand.nextFloat() * 360.0F), 0.0F); + entityliving.rotationYawHead = entityliving.rotationYaw; + entityliving.renderYawOffset = entityliving.rotationYaw; + if (net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, worldIn, (float) x, (float) y, (float) z, null)) return null; + entityliving.onInitialSpawn(worldIn.getDifficultyForLocation(new BlockPos(entityliving)), (IEntityLivingData)null); + worldIn.spawnEntity(entity); + ((EntityPrehistoricFloraPalaeontinid)entityliving).setPNType(EntityPrehistoricFloraPalaeontinid.Type.getTypeFromString(this.variant)); + entityliving.playLivingSound(); + } + return entity; + + } + } +} diff --git a/src/main/java/net/lepidodendron/util/AcidBathOutputMobs.java b/src/main/java/net/lepidodendron/util/AcidBathOutputMobs.java index b83b187763..613492a3d3 100644 --- a/src/main/java/net/lepidodendron/util/AcidBathOutputMobs.java +++ b/src/main/java/net/lepidodendron/util/AcidBathOutputMobs.java @@ -953,7 +953,6 @@ public static String[] getPermianCleanedFossilsMobs() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraBethesdaichthys.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeodictyoptera.class)).getRegistryName().toString() + "@" + EntityPrehistoricFloraPalaeodictyoptera.Type.DUNBARIA.getName(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeoniscum.class)).getRegistryName().toString(), - (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeontinid.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPantylus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParanaichthys.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPlatyhystrix.class)).getRegistryName().toString(), @@ -1107,7 +1106,6 @@ public static String[] getTriassicCleanedFossilsMobs() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraMorganucodon.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraNothosaurus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraOpolanka.class)).getRegistryName().toString(), - (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeontinid.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPanzhousaurus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParhybodus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPlacerias.class)).getRegistryName().toString(), @@ -1235,10 +1233,10 @@ public static String[] getTriassicCleanedFossilsMobs() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParringtonia.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraDyoplax.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraErpetosuchus.class)).getRegistryName().toString(), -// (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraYonghesuchus.class)).getRegistryName().toString(), -// (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParvosuchus.class)).getRegistryName().toString(), -// (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraGracilisuchus.class)).getRegistryName().toString(), -// (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraTurfanosuchus.class)).getRegistryName().toString(), + (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraYonghesuchus.class)).getRegistryName().toString(), + (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParvosuchus.class)).getRegistryName().toString(), + (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraGracilisuchus.class)).getRegistryName().toString(), + (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraTurfanosuchus.class)).getRegistryName().toString(), @@ -1262,7 +1260,6 @@ public static String[] getJurassicCleanedFossilsMobs() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraLonchidion.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraMegalosaurus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraMorganucodon.class)).getRegistryName().toString(), - (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeontinid.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraRoachoidAridInsect.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraRoachoidForestInsect.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraRoachoidSwampInsect.class)).getRegistryName().toString(), @@ -1346,7 +1343,6 @@ public static String[] getJurassicCleanedFossilsMobs() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraCenoceras.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraCoccoderma.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraMorrolepis.class)).getRegistryName().toString(), - (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraDaohugoucossus.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraTrachymetopon.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPanacanthocaris.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraThalassiodracon.class)).getRegistryName().toString(), @@ -1661,7 +1657,6 @@ public static String[] getCretaceousCleanedFossilsMobsEarly() { (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraOnchopristis.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPachyamia.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeocambarus.class)).getRegistryName().toString(), - (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPalaeontinid.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParacestracion.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraParaclupea.class)).getRegistryName().toString(), (net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(EntityPrehistoricFloraPhylloceras.class)).getRegistryName().toString(), diff --git a/src/main/java/net/lepidodendron/util/ModTriggers.java b/src/main/java/net/lepidodendron/util/ModTriggers.java index e6f390326e..e8526db7f0 100644 --- a/src/main/java/net/lepidodendron/util/ModTriggers.java +++ b/src/main/java/net/lepidodendron/util/ModTriggers.java @@ -2238,6 +2238,7 @@ public class ModTriggers public static final CustomTrigger CLICK_ILERDOCOSSUS = new CustomTrigger("pf_book_palaeontinid_ilerdocossus"); public static final CustomTrigger CLICK_BAEOCOSSUS = new CustomTrigger("pf_book_palaeontinid_baeocossus"); public static final CustomTrigger CLICK_COLOSSOCOSSUS = new CustomTrigger("pf_book_palaeontinid_colossocossus"); + public static final CustomTrigger CLICK_PACHYPSYCHE = new CustomTrigger("pf_book_palaeontinid_pachypsyche"); public static final CustomTrigger CLICK_EOPROSCOPIA = new CustomTrigger("pf_book_eoproscopia"); public static final CustomTrigger CLICK_PROTOPHASMA = new CustomTrigger("pf_book_protophasma"); public static final CustomTrigger CLICK_JURAMANTOPHASMA = new CustomTrigger("pf_book_juramantophasma"); @@ -4842,6 +4843,7 @@ public class ModTriggers CLICK_MINICRANIA, CLICK_STRUTHIOCEPHALUS, CLICK_BOLIVOSTEUS, + CLICK_PACHYPSYCHE, }; /** diff --git a/src/main/java/net/lepidodendron/world/gen/WorldGenAncientMoss.java b/src/main/java/net/lepidodendron/world/gen/WorldGenAncientMoss.java index eeab609f44..3e1dca8b44 100644 --- a/src/main/java/net/lepidodendron/world/gen/WorldGenAncientMoss.java +++ b/src/main/java/net/lepidodendron/world/gen/WorldGenAncientMoss.java @@ -161,7 +161,6 @@ public static void PlaceEggs(Random rand, World worldIn, BlockPos pos) { "lepidodendron:prehistoric_flora_arthropleura", "lepidodendron:prehistoric_flora_attercopus", "lepidodendron:prehistoric_flora_permarachne", - "lepidodendron:prehistoric_flora_daohugoucossus", "lepidodendron:prehistoric_flora_gerarus", "lepidodendron:prehistoric_flora_harvestman", "lepidodendron:prehistoric_flora_myriacantherpestes", diff --git a/src/main/java/net/lepidodendron/world/gen/WorldGenTreeRottenLog.java b/src/main/java/net/lepidodendron/world/gen/WorldGenTreeRottenLog.java index 3c14e7c933..d66002ac76 100644 --- a/src/main/java/net/lepidodendron/world/gen/WorldGenTreeRottenLog.java +++ b/src/main/java/net/lepidodendron/world/gen/WorldGenTreeRottenLog.java @@ -140,7 +140,6 @@ public void PlaceEggs(Random rand, World worldIn, BlockPos pos) { "lepidodendron:prehistoric_flora_archocyrtus", "lepidodendron:prehistoric_flora_arthropleura", "lepidodendron:prehistoric_flora_attercopus", - "lepidodendron:prehistoric_flora_daohugoucossus", "lepidodendron:prehistoric_flora_gerarus", "lepidodendron:prehistoric_flora_harvestman", "lepidodendron:prehistoric_flora_myriacantherpestes", diff --git a/src/main/resources/assets/lepidodendron/lang/en_us.lang b/src/main/resources/assets/lepidodendron/lang/en_us.lang index 604da12c5d..cdae0c6995 100644 --- a/src/main/resources/assets/lepidodendron/lang/en_us.lang +++ b/src/main/resources/assets/lepidodendron/lang/en_us.lang @@ -4665,7 +4665,7 @@ entity.prehistoric_flora_daihuoides.name=Daihuoides entity.prehistoric_flora_dakosaurus.name=Dakosaurus entity.prehistoric_flora_dalmanites.name=Dalmanites entity.prehistoric_flora_damselfly.name=Damselfly -entity.prehistoric_flora_daohugoucossus.name=Daohugoucossus +entity.prehistoric_flora_palaeontinid_daohugoucossus.name=Daohugoucossus entity.prehistoric_flora_dapedium.name=Dapedium entity.prehistoric_flora_dastilbe.name=Dastilbe entity.prehistoric_flora_dasyceps.name=Dasyceps @@ -6704,7 +6704,7 @@ item.pf_daisy_seeds.name=Daisy Seeds item.pf_dakosaurus_raw.name=Raw Dakosaurus item.pf_dalmanites_raw.name=Raw Dalmanites item.pf_damselfly_raw.name=Raw Damselfly -item.pf_daohugoucossus_raw.name=Raw Daohugoucossus +item.pf_palaeontinid_daohugoucossus_raw.name=Raw Daohugoucossus item.pf_dapedium_raw.name=Raw Dapedium item.pf_dastilbe_raw.name=Raw Dastilbe item.pf_dasyceps_raw.name=Raw Dasyceps @@ -12173,6 +12173,7 @@ advancements.pf_adv_book_palaeontinid_miracossus.description=Unlock the entry fo advancements.pf_adv_book_palaeontinid_ilerdocossus.description=Unlock the entry for Ilerdocossus in the Palaeopedia to gain extra new pages about it! advancements.pf_adv_book_palaeontinid_baeocossus.description=Unlock the entry for Baeocossus in the Palaeopedia to gain extra new pages about it! advancements.pf_adv_book_palaeontinid_colossocossus.description=Unlock the entry for Colossocossus in the Palaeopedia to gain extra new pages about it! +advancements.pf_adv_book_palaeontinid_pachypsyche.description=Unlock the entry for Pachypsyche in the Palaeopedia to gain extra new pages about it! advancements.pf_adv_book_eoproscopia.description=Unlock the entry for Eoproscopia in the Palaeopedia to gain extra new pages about it! advancements.pf_adv_book_protophasma.description=Unlock the entry for Protophasma in the Palaeopedia to gain extra new pages about it! advancements.pf_adv_book_juramantophasma.description=Unlock the entry for Juramantophasma in the Palaeopedia to gain extra new pages about it! @@ -12376,6 +12377,7 @@ advancements.pf_adv_book_palaeontinid_miracossus.title=Miracossus advancements.pf_adv_book_palaeontinid_ilerdocossus.title=Ilerdocossus advancements.pf_adv_book_palaeontinid_baeocossus.title=Baeocossus advancements.pf_adv_book_palaeontinid_colossocossus.title=Colossocossus +advancements.pf_adv_book_palaeontinid_pachypsyche.title=Pachypsyche advancements.pf_adv_book_eoproscopia.title=Eoproscopia advancements.pf_adv_book_protophasma.title=Protophasma advancements.pf_adv_book_juramantophasma.title=Juramantophasma @@ -12572,15 +12574,16 @@ item.pf_raptoblatta_raw.name=Raw Raptoblatta item.pf_umenopterix_raw.name=Raw Umenopterix item.pf_gigamachilis_raw.name=Raw Gigamachilis item.pf_archaeognatha_raw.name=Raw Archaeognatha -item.pf_austroprosboloides_raw.name=Raw Austroprosboloides -item.pf_fletcheriana _raw.name=Raw Fletcheriana -item.pf_papiliontina_raw.name=Raw Papiliontina -item.pf_eocicada_raw.name=Raw Eocicada -item.pf_talbragarocossus_raw.name=Raw Talbragarocossus -item.pf_miracossus_raw.name=Raw Miracossus -item.pf_ilerdocossus_raw.name=Raw Ilerdocossus -item.pf_baeocossus_raw.name=Raw Baeocossus -item.pf_colossocossus_raw.name=Raw Colossocossus +item.pf_palaeontinid_austroprosboloides_raw.name=Raw Austroprosboloides +item.pf_palaeontinid_fletcheriana _raw.name=Raw Fletcheriana +item.pf_palaeontinid_papiliontina_raw.name=Raw Papiliontina +item.pf_palaeontinid_eocicada_raw.name=Raw Eocicada +item.pf_palaeontinid_talbragarocossus_raw.name=Raw Talbragarocossus +item.pf_palaeontinid_miracossus_raw.name=Raw Miracossus +item.pf_palaeontinid_ilerdocossus_raw.name=Raw Ilerdocossus +item.pf_palaeontinid_baeocossus_raw.name=Raw Baeocossus +item.pf_palaeontinid_colossocossus_raw.name=Raw Colossocossus +item.pf_palaeontinid_pachypsyche_raw.name=Raw Pachypsyche item.pf_eoproscopia_raw.name=Raw Eoproscopia item.pf_protophasma_raw.name=Raw Protophasma item.pf_juramantophasma_raw.name=Raw Juramantophasma @@ -12775,15 +12778,16 @@ entity.prehistoric_flora_raptoblatta.name=Raptoblatta entity.prehistoric_flora_umenopterix.name=Umenopterix entity.prehistoric_flora_gigamachilis.name=Gigamachilis entity.prehistoric_flora_archaeognatha.name=Archaeognatha -entity.prehistoric_flora_austroprosboloides.name=Austroprosboloides -entity.prehistoric_flora_fletcheriana .name=Fletcheriana -entity.prehistoric_flora_papiliontina.name=Papiliontina -entity.prehistoric_flora_eocicada.name=Eocicada -entity.prehistoric_flora_talbragarocossus.name=Talbragarocossus -entity.prehistoric_flora_miracossus.name=Miracossus -entity.prehistoric_flora_ilerdocossus.name=Ilerdocossus -entity.prehistoric_flora_baeocossus.name=Baeocossus -entity.prehistoric_flora_colossocossus.name=Colossocossus +entity.prehistoric_flora_palaeontinid_austroprosboloides.name=Austroprosboloides +entity.prehistoric_flora_palaeontinid_fletcheriana .name=Fletcheriana +entity.prehistoric_flora_palaeontinid_papiliontina.name=Papiliontina +entity.prehistoric_flora_palaeontinid_eocicada.name=Eocicada +entity.prehistoric_flora_palaeontinid_talbragarocossus.name=Talbragarocossus +entity.prehistoric_flora_palaeontinid_miracossus.name=Miracossus +entity.prehistoric_flora_palaeontinid_ilerdocossus.name=Ilerdocossus +entity.prehistoric_flora_palaeontinid_baeocossus.name=Baeocossus +entity.prehistoric_flora_palaeontinid_colossocossus.name=Colossocossus +entity.prehistoric_flora_palaeontinid_pachypsyche.name=Pachypsyche entity.prehistoric_flora_eoproscopia.name=Eoproscopia entity.prehistoric_flora_protophasma.name=Protophasma entity.prehistoric_flora_juramantophasma.name=Juramantophasma @@ -13406,3 +13410,15 @@ advancements.pf_adv_book_bolivosteus.description=Unlock the entry for Bolivosteu advancements.pf_adv_book_bolivosteus.title=Bolivosteus item.pf_bolivosteus_raw.name=Raw Bolivosteus entity.prehistoric_flora_bolivosteus.name=Bolivosteus +item.pf_spawn_egg_palaeontinid_austroprosboloides.name=Spawn Austroprosboloides +item.pf_spawn_egg_palaeontinid_fletcheriana.name=Spawn Fletcheriana +item.pf_spawn_egg_palaeontinid_papiliontina.name=Spawn Papiliontina +item.pf_spawn_egg_palaeontinid_talbragarocossus.name=Spawn Talbragarocossus +item.pf_spawn_egg_palaeontinid_daohugoucossus.name=Spawn Daohugoucossus +item.pf_spawn_egg_palaeontinid_eocicada.name=Spawn Eocicada +item.pf_spawn_egg_palaeontinid_pachypsyche.name=Spawn Pachypsyche +item.pf_spawn_egg_palaeontinid_miracossus.name=Spawn Miracossus +item.pf_spawn_egg_palaeontinid_ilerdocossus.name=Spawn Ilerdocossus +item.pf_spawn_egg_palaeontinid_baeocossus.name=Spawn Baeocossus +item.pf_spawn_egg_palaeontinid_colossocossus.name=Spawn Colossocossus + diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/daohugoucossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/daohugoucossus.json index eac3cf6764..b095296ef6 100644 --- a/src/main/resources/assets/lepidodendron/loot_tables/entity/daohugoucossus.json +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/daohugoucossus.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "lepidodendron:daohugoucossus_raw", + "name": "lepidodendron:palaeontinid_daohugoucossus_raw", "weight": 1, "functions": [ { diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_austroprosboloides.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_austroprosboloides.json new file mode 100644 index 0000000000..7a0f48ab57 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_austroprosboloides.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_austroprosboloides", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_austroprosboloides_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_baeocossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_baeocossus.json new file mode 100644 index 0000000000..33508123ec --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_baeocossus.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_baeocossus", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_baeocossus_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_colossocossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_colossocossus.json new file mode 100644 index 0000000000..2aa76a2446 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_colossocossus.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_colossocossus", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_colossocossus_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_eocicada.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_eocicada.json new file mode 100644 index 0000000000..8d09493469 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_eocicada.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_eocicada", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_eocicada_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_fletcheriana.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_fletcheriana.json new file mode 100644 index 0000000000..23468dde50 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_fletcheriana.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_fletcheriana", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_fletcheriana_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_ilerdocossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_ilerdocossus.json new file mode 100644 index 0000000000..9218b8b356 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_ilerdocossus.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_ilerdocossus", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_ilerdocossus_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_miracossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_miracossus.json new file mode 100644 index 0000000000..9821e78c78 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_miracossus.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_miracossus", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_miracossus_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_pachypsyche.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_pachypsyche.json new file mode 100644 index 0000000000..8b2db8ecda --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_pachypsyche.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_pachypsyche", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_pachypsyche_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_papiliontina.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_papiliontina.json new file mode 100644 index 0000000000..512c69fd29 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_papiliontina.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_papiliontina", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_papiliontina_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_talbragarocossus.json b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_talbragarocossus.json new file mode 100644 index 0000000000..597e3724aa --- /dev/null +++ b/src/main/resources/assets/lepidodendron/loot_tables/entity/palaeontinid_talbragarocossus.json @@ -0,0 +1,24 @@ +{ + "pools": [ + { + "name": "palaeontinid_talbragarocossus", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "lepidodendron:palaeontinid_talbragarocossus_raw", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/daohugoucossus_raw.json b/src/main/resources/assets/lepidodendron/models/item/entities/palaeontinid_daohugoucossus_raw.json similarity index 100% rename from src/main/resources/assets/lepidodendron/models/item/entities/daohugoucossus_raw.json rename to src/main/resources/assets/lepidodendron/models/item/entities/palaeontinid_daohugoucossus_raw.json diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/palaeontinid_pachypsyche_raw.json b/src/main/resources/assets/lepidodendron/models/item/entities/palaeontinid_pachypsyche_raw.json new file mode 100644 index 0000000000..967ca94a4f --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/palaeontinid_pachypsyche_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lepidodendron:items/entities/palaeontinid_pachypsyche_raw.png" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_austroprosboloides.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_austroprosboloides.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_austroprosboloides.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_baeocossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_baeocossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_baeocossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_colossocossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_colossocossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_colossocossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_daohugoucossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_daohugoucossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_daohugoucossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_eocicada.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_eocicada.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_eocicada.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_fletcheriana.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_fletcheriana.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_fletcheriana.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_ilerdocossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_ilerdocossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_ilerdocossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_miracossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_miracossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_miracossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_pachypsyche.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_pachypsyche.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_pachypsyche.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_papiliontina.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_papiliontina.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_papiliontina.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_talbragarocossus.json b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_talbragarocossus.json new file mode 100644 index 0000000000..a840ad5220 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/entities/spawneggs/spawn_egg_palaeontinid_talbragarocossus.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/spawn_egg", + "layer1": "items/spawn_egg_overlay" + } +} diff --git a/src/main/resources/assets/lepidodendron/models/item/fossils/fossil_daohugoucossus_clean.json b/src/main/resources/assets/lepidodendron/models/item/fossils/fossil_palaeontinid_daohugoucossus_clean.json similarity index 100% rename from src/main/resources/assets/lepidodendron/models/item/fossils/fossil_daohugoucossus_clean.json rename to src/main/resources/assets/lepidodendron/models/item/fossils/fossil_palaeontinid_daohugoucossus_clean.json diff --git a/src/main/resources/assets/lepidodendron/models/item/fossils/fossil_palaeontinid_pachypsyche_clean.json b/src/main/resources/assets/lepidodendron/models/item/fossils/fossil_palaeontinid_pachypsyche_clean.json new file mode 100644 index 0000000000..3320ff6c27 --- /dev/null +++ b/src/main/resources/assets/lepidodendron/models/item/fossils/fossil_palaeontinid_pachypsyche_clean.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lepidodendron:items/fossil_clean_background", + "layer1": "lepidodendron:items/fossil_palaeontinid_pachypsyche_clean" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_austroprosboloides.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_austroprosboloides.png new file mode 100644 index 0000000000..555e7130f9 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_austroprosboloides.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_baeocossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_baeocossus.png new file mode 100644 index 0000000000..5a7c193527 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_baeocossus.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_colossocossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_colossocossus.png new file mode 100644 index 0000000000..79e603faf6 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_colossocossus.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_daohugoucossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_daohugoucossus.png new file mode 100644 index 0000000000..74f989d806 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_daohugoucossus.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_eocicada.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_eocicada.png new file mode 100644 index 0000000000..40615e04ba Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_eocicada.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_fletcheriana.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_fletcheriana.png new file mode 100644 index 0000000000..b7a691b41e Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_fletcheriana.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_ilerdocossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_ilerdocossus.png new file mode 100644 index 0000000000..db8f4bcc18 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_ilerdocossus.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_miracossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_miracossus.png new file mode 100644 index 0000000000..1f286983d8 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_miracossus.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_pachypsyche.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_pachypsyche.png new file mode 100644 index 0000000000..95a446d866 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_pachypsyche.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_papiliontina.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_papiliontina.png new file mode 100644 index 0000000000..c95e32ec9c Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_papiliontina.png differ diff --git a/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_talbragarocossus.png b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_talbragarocossus.png new file mode 100644 index 0000000000..bec944fbc5 Binary files /dev/null and b/src/main/resources/assets/lepidodendron/textures/entities/palaeontinid_talbragarocossus.png differ