Skip to content

more mobs and render fix for my merges #607

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 4 commits into
base: master
Choose a base branch
from
Open

more mobs and render fix for my merges #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf3bbfc
Macromyzon and bug fixes
shinycosmic Mar 28, 2026
a9f12aa
Merge branch 'AechtRob:master' into master
shinycosmic Apr 5, 2026
a8b10b1
Litorosuchus, Frogs, Langobardi
shinycosmic Apr 5, 2026
3708739
Merge remote-tracking branch 'origin/master'
shinycosmic Apr 5, 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
19 changes: 10 additions & 9 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 @@ -1418,7 +1418,7 @@ public static void registerEntities() {
registerEntity("prehistoric_flora_amargasaurus", EntityPrehistoricFloraAmargasaurus.class, LepidodendronMod.ENTITY_AMARGASAURUS, 184,-8294048,-9883643);
registerEntity("prehistoric_flora_bajadasaurus", EntityPrehistoricFloraBajadasaurus.class, LepidodendronMod.ENTITY_BAJADASAURUS, 184,-7577540,-2311312);
registerEntity("prehistoric_flora_mirasaura", EntityPrehistoricFloraMirasaura.class, LepidodendronMod.ENTITY_MIRASAURA, 48,-13093595,-13281135);
// registerEntity("prehistoric_flora_icarosaurus", EntityPrehistoricFloraIcarosaurus.class, LepidodendronMod.ENTITY_ICAROSAURUS, 48,-11354642,-15131876);
registerEntity("prehistoric_flora_icarosaurus", EntityPrehistoricFloraIcarosaurus.class, LepidodendronMod.ENTITY_ICAROSAURUS, 48,-7962571,-3950536);
registerEntity("prehistoric_flora_kuehneosuchus", EntityPrehistoricFloraKuehneosuchus.class, LepidodendronMod.ENTITY_KUEHNEOSUCHUS, 48,-16250875,-15590857);
registerEntity("prehistoric_flora_kuehneosaurus", EntityPrehistoricFloraKuehneosaurus.class, LepidodendronMod.ENTITY_KUEHNEOSAURUS, 48,-1513240,-8639187);
registerEntity("prehistoric_flora_ozimek", EntityPrehistoricFloraOzimek.class, LepidodendronMod.ENTITY_OZIMEK, 48,-11515585,-7639480);
Expand All @@ -1435,7 +1435,7 @@ public static void registerEntities() {
registerEntity("prehistoric_flora_melvius", EntityPrehistoricFloraMelvius.class, LepidodendronMod.ENTITY_MELVIUS, 64,-10262705,-13618900);
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_thryptodus", EntityPrehistoricFloraThryptodus.class, LepidodendronMod.ENTITY_THRYPTODUS, 48,-14800847,-5195329);
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 @@ -1473,11 +1473,12 @@ 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_palaeopalaemon", EntityPrehistoricFloraPalaeopalaemon.class, LepidodendronMod.ENTITY_PALAEOPALAEMON, 48,-11571611,-4998023);
registerEntity("prehistoric_flora_macromyzon", EntityPrehistoricFloraMacromyzon.class, LepidodendronMod.ENTITY_MACROMYZON, 48,-9417678,-2569805);
registerEntity("prehistoric_flora_litorosuchus", EntityPrehistoricFloraLitorosuchus.class, LepidodendronMod.ENTITY_LITOROSUCHUS, 64,-4864849,-2694958);
registerEntity("prehistoric_flora_langobardisaurus", EntityPrehistoricFloraLangobardisaurus.class, LepidodendronMod.ENTITY_LANGOBARDISAURUS, 48,-14738150,-3062752);
registerEntity("prehistoric_flora_peltobatrachus", EntityPrehistoricFloraPeltobatrachus.class, LepidodendronMod.ENTITY_PELTOBATRACHUS, 48,-10790320,-15132397);
// registerEntity("prehistoric_flora_eusaurosphargis", EntityPrehistoricFloraEusaurosphargis.class, LepidodendronMod.ENTITY_EUSAUROSPHARGIS, 48,-11354642,-15131876);
registerEntity("prehistoric_flora_tremataspis", EntityPrehistoricFloraTremataspis.class, LepidodendronMod.ENTITY_TREMATASPIS, 48,-6975093,-5530509);
registerEntity("prehistoric_flora_cratosirex", EntityPrehistoricFloraCratosirex.class, LepidodendronMod.ENTITY_CRATOSIREX, 48,-3032472,-15527150);
registerEntity("prehistoric_flora_rafaeliana", EntityPrehistoricFloraRafaeliana.class, LepidodendronMod.ENTITY_RAFAELIANA, 48,-1075077,-14214120);
Expand All @@ -1498,8 +1499,8 @@ public static void registerEntities() {
// 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_iberobatrachus", EntityPrehistoricFloraIberobatrachus.class, LepidodendronMod.ENTITY_IBEROBATRACHUS, 48,-2045849,-2393268);
registerEntity("prehistoric_flora_liaobatrachus", EntityPrehistoricFloraLiaobatrachus.class, LepidodendronMod.ENTITY_LIAOBATRACHUS, 48,-8941134,-5014960);
// 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);
Expand Down
3 changes: 3 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 @@ -3583,13 +3583,16 @@ public class LepidodendronMod {
static final int ENTITY_ECTENASPIS = 1468;
public static final ResourceLocation ECTENASPIS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/ectenaspis"));
static final int ENTITY_PALAEOPALAEMON = 1469;
public static final ResourceLocation PALAEOPALAEMON_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/palaeopalaemon"));
static final int ENTITY_PRIAPULITES = 1470;
static final int ENTITY_PALAEOCAMPA = 1471;
static final int ENTITY_MACROMYZON = 1472;
public static final ResourceLocation MACROMYZON_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/macromyzon"));
static final int ENTITY_PETROLACOSAURUS = 1473;
public static final ResourceLocation PETROLACOSAURUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/petrolacosaurus"));
static final int ENTITY_TUDITANUS = 1474;
static final int ENTITY_PELTOBATRACHUS = 1475;
public static final ResourceLocation PELTOBATRACHUS_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/peltobatrachus"));
static final int ENTITY_GAIASIA = 1476;
public static final ResourceLocation GAIASIA_LOOT = LootTableList.register(new ResourceLocation(LepidodendronMod.MODID, "entity/gaiasia"));
static final int ENTITY_XINJIANGTITAN = 1477;
Expand Down
9 changes: 9 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 @@ -6542,6 +6542,15 @@ public class LepidodendronSorter {
public static final int cratosirex_raw = 5983;
public static final int raptoblatta_raw = 5984;
public static final int rafaeliana_raw = 5985;
public static final int macromyzon_raw = 5986;
public static final int icarosaurus_raw = 5987;
public static final int eggs_icarosaurus = 5988;
public static final int palaeopalaemon_raw = 5989;
public static final int peltobatrachus_raw = 5990;
public static final int abyssosaurus_raw = 5991;
public static final int iberobatrachus_raw = 5992;
public static final int liaobatrachus_raw = 5993;


public static final int bivalve_toucasia = 6000;
public static final int coeloptychium = 6001;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraArchaeognatha_jungle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ public class EntityPrehistoricFloraArchaeognatha_jungle extends EntityPrehistori

public EntityPrehistoricFloraArchaeognatha_jungle(World world) {
super(world);
setSize(0.2F, 0.2F);
setSize(0.12F, 0.12F);
minWidth = 0.1F;
maxWidth = 0.2F;
maxHeight = 0.2F;
maxWidth = 0.12F;
maxHeight = 0.12F;
maxHealthAgeable = 2.0D;
JUMP_ANIMATION = Animation.create(this.getJumpLength());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/lepidodendron/entity/EntityPrehistoricFloraArchaeognatha_rocky.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ public class EntityPrehistoricFloraArchaeognatha_rocky extends EntityPrehistoric

public EntityPrehistoricFloraArchaeognatha_rocky(World world) {
super(world);
setSize(0.2F, 0.2F);
setSize(0.12F, 0.12F);
minWidth = 0.1F;
maxWidth = 0.2F;
maxHeight = 0.2F;
maxWidth = 0.12F;
maxHeight = 0.12F;
maxHealthAgeable = 2.0D;
JUMP_ANIMATION = Animation.create(this.getJumpLength());
}
Expand Down
Loading