Skip to content

Palaeontinids #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shinycosmic wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Palaeontinids #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8d0061
Palaeontinids
shinycosmic Feb 6, 2026
63c9a22
Merge branch 'AechtRob:master' into master
shinycosmic Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions src/main/java/net/lepidodendron/EntityRegistries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/net/lepidodendron/LepidodendronBookSubscribers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/net/lepidodendron/LepidodendronMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/net/lepidodendron/LepidodendronSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading