Skip to content

Pitys + Leptophloeum(broken) #8

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

Merged
AechtRob merged 2 commits into from
Jul 18, 2025
Merged

Pitys + Leptophloeum(broken) #8

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
df58f90
Pitys
Floi1 Jul 18, 2025
891dd05
Leptophloeum(wip}
Floi1 Jul 18, 2025
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
20 changes: 20 additions & 0 deletions src/main/java/com/github/aechtrob/prehistoricnature/PrehistoricNature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.BlocksTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.EntitiesTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.ItemsTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.BlocksTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.EntitiesTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.ItemsTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.BlocksTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.EntitiesTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.ItemsTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.BlocksTreeSciadopitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.EntitiesTreeSciadopitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.ItemsTreeSciadopitys;
Expand Down Expand Up @@ -148,6 +154,14 @@ public PrehistoricNature(IEventBus modEventBus, ModContainer modContainer)
BlocksTreeLepidophloios.register(modEventBus);
EntitiesTreeLepidophloios.register(modEventBus);

ItemsTreeLeptophloeum.register(modEventBus);
BlocksTreeLeptophloeum.register(modEventBus);
EntitiesTreeLeptophloeum.register(modEventBus);

ItemsTreePitys.register(modEventBus);
BlocksTreePitys.register(modEventBus);
EntitiesTreePitys.register(modEventBus);

ItemsTreeSciadopitys.register(modEventBus);
BlocksTreeSciadopitys.register(modEventBus);
EntitiesTreeSciadopitys.register(modEventBus);
Expand Down Expand Up @@ -218,6 +232,8 @@ public static void onClientSetup(FMLClientSetupEvent event)
Sheets.addWoodType(PNWoodTypes.GLOSSOPTERISA);
Sheets.addWoodType(PNWoodTypes.LEPIDODENDRON);
Sheets.addWoodType(PNWoodTypes.LEPIDOPHLOIOS);
Sheets.addWoodType(PNWoodTypes.LEPTOPHLOEUM);
Sheets.addWoodType(PNWoodTypes.PITYS);
Sheets.addWoodType(PNWoodTypes.SCIADOPITYS);
Sheets.addWoodType(PNWoodTypes.SYNCHYSIDENDRON);
}
Expand All @@ -241,6 +257,10 @@ public static void onClientSetup(EntityRenderersEvent.RegisterRenderers event)
event.registerEntityRenderer(EntitiesTreeLepidodendron.LEPIDODENDRON_CHEST_BOAT.get(), context -> new PNBoatChestRenderer(context, ModelLayers.OAK_CHEST_BOAT, "lepidodendron"));
event.registerEntityRenderer(EntitiesTreeLepidophloios.LEPIDOPHLOIOS_BOAT.get(), context -> new PNBoatRenderer(context, ModelLayers.OAK_BOAT, "lepidophloios"));
event.registerEntityRenderer(EntitiesTreeLepidophloios.LEPIDOPHLOIOS_CHEST_BOAT.get(), context -> new PNBoatChestRenderer(context, ModelLayers.OAK_CHEST_BOAT, "lepidophloios"));
event.registerEntityRenderer(EntitiesTreeLeptophloeum.LEPTOPHLOEUM_BOAT.get(), context -> new PNBoatRenderer(context, ModelLayers.OAK_BOAT, "leptophloeum"));
event.registerEntityRenderer(EntitiesTreeLeptophloeum.LEPTOPHLOEUM_CHEST_BOAT.get(), context -> new PNBoatChestRenderer(context, ModelLayers.OAK_CHEST_BOAT, "leptophloeum"));
event.registerEntityRenderer(EntitiesTreePitys.PITYS_BOAT.get(), context -> new PNBoatRenderer(context, ModelLayers.OAK_BOAT, "pitys"));
event.registerEntityRenderer(EntitiesTreePitys.PITYS_CHEST_BOAT.get(), context -> new PNBoatChestRenderer(context, ModelLayers.OAK_CHEST_BOAT, "pitys"));
event.registerEntityRenderer(EntitiesTreeSciadopitys.SCIADOPITYS_BOAT.get(), context -> new PNBoatRenderer(context, ModelLayers.OAK_BOAT, "sciadopitys"));
event.registerEntityRenderer(EntitiesTreeSciadopitys.SCIADOPITYS_CHEST_BOAT.get(), context -> new PNBoatChestRenderer(context, ModelLayers.OAK_CHEST_BOAT, "sciadopitys"));
event.registerEntityRenderer(EntitiesTreeSynchysidendron.SYNCHYSIDENDRON_BOAT.get(), context -> new PNBoatRenderer(context, ModelLayers.OAK_BOAT, "synchysidendron"));
Expand Down
63 changes: 63 additions & 0 deletions src/main/java/com/github/aechtrob/prehistoricnature/creativetabs/ModCreativeTabs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
import com.github.aechtrob.prehistoricnature.world.tree.lepidodendron.ItemsTreeLepidodendron;
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.BlocksTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.ItemsTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.BlocksTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.ItemsTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.BlocksTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.ItemsTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.BlocksTreeSciadopitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.ItemsTreeSciadopitys;
import com.github.aechtrob.prehistoricnature.world.tree.synchysidendron.BlocksTreeSynchysidendron;
Expand Down Expand Up @@ -166,6 +170,34 @@ public class ModCreativeTabs {
output.accept(BlocksTreeLepidophloios.LEPIDOPHLOIOS_PRESSURE_PLATE.get().asItem());
output.accept(BlocksTreeLepidophloios.LEPIDOPHLOIOS_BUTTON.get().asItem());

output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_LOG.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_WOOD.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_STRIPPED_LOG.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_STRIPPED_WOOD.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_PLANKS.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_STAIRS.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_SLAB.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_FENCE.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_FENCE_GATE.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_DOOR.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_TRAPDOOR.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_PRESSURE_PLATE.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_BUTTON.get().asItem());

output.accept(BlocksTreePitys.PITYS_LOG.get().asItem());
output.accept(BlocksTreePitys.PITYS_WOOD.get().asItem());
output.accept(BlocksTreePitys.PITYS_STRIPPED_LOG.get().asItem());
output.accept(BlocksTreePitys.PITYS_STRIPPED_WOOD.get().asItem());
output.accept(BlocksTreePitys.PITYS_PLANKS.get().asItem());
output.accept(BlocksTreePitys.PITYS_STAIRS.get().asItem());
output.accept(BlocksTreePitys.PITYS_SLAB.get().asItem());
output.accept(BlocksTreePitys.PITYS_FENCE.get().asItem());
output.accept(BlocksTreePitys.PITYS_FENCE_GATE.get().asItem());
output.accept(BlocksTreePitys.PITYS_DOOR.get().asItem());
output.accept(BlocksTreePitys.PITYS_TRAPDOOR.get().asItem());
output.accept(BlocksTreePitys.PITYS_PRESSURE_PLATE.get().asItem());
output.accept(BlocksTreePitys.PITYS_BUTTON.get().asItem());

output.accept(BlocksTreeSciadopitys.SCIADOPITYS_LOG.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_WOOD.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_STRIPPED_LOG.get().asItem());
Expand Down Expand Up @@ -224,6 +256,13 @@ public class ModCreativeTabs {
output.accept(BlocksTreeLepidophloios.LEPIDOPHLOIOS_SAPLING.get().asItem());
output.accept(BlocksTreeLepidophloios.LEPIDOPHLOIOS_STROBILUS.get().asItem());

output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_LEAVES.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_SAPLING.get().asItem());

output.accept(BlocksTreePitys.PITYS_LEAVES.get().asItem());
output.accept(BlocksTreePitys.PITYS_SAPLING.get().asItem());
output.accept(BlocksTreePitys.PITYS_STROBILUS.get().asItem());

output.accept(BlocksTreeSciadopitys.SCIADOPITYS_LEAVES.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_SAPLING.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_FRUIT.get().asItem());
Expand Down Expand Up @@ -296,6 +335,24 @@ public class ModCreativeTabs {
output.accept(ItemsTreeLepidophloios.LEPIDOPHLOIOS_SIGN.get().asItem());
output.accept(ItemsTreeLepidophloios.LEPIDOPHLOIOS_HANGING_SIGN.get().asItem());

output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_BENCH.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_LITTERBIN.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_BRIDGE.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_LADDER.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_PLANTER_1.get().asItem());
output.accept(BlocksTreeLeptophloeum.LEPTOPHLOEUM_PLANTER_2.get().asItem());
output.accept(ItemsTreeLeptophloeum.LEPTOPHLOEUM_SIGN.get().asItem());
output.accept(ItemsTreeLeptophloeum.LEPTOPHLOEUM_HANGING_SIGN.get().asItem());

output.accept(BlocksTreePitys.PITYS_BENCH.get().asItem());
output.accept(BlocksTreePitys.PITYS_LITTERBIN.get().asItem());
output.accept(BlocksTreePitys.PITYS_BRIDGE.get().asItem());
output.accept(BlocksTreePitys.PITYS_LADDER.get().asItem());
output.accept(BlocksTreePitys.PITYS_PLANTER_1.get().asItem());
output.accept(BlocksTreePitys.PITYS_PLANTER_2.get().asItem());
output.accept(ItemsTreePitys.PITYS_SIGN.get().asItem());
output.accept(ItemsTreePitys.PITYS_HANGING_SIGN.get().asItem());

output.accept(BlocksTreeSciadopitys.SCIADOPITYS_BENCH.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_LITTERBIN.get().asItem());
output.accept(BlocksTreeSciadopitys.SCIADOPITYS_BRIDGE.get().asItem());
Expand Down Expand Up @@ -343,6 +400,12 @@ public class ModCreativeTabs {
output.accept(ItemsTreeLepidophloios.LEPIDOPHLOIOS_BOAT.get().asItem());
output.accept(ItemsTreeLepidophloios.LEPIDOPHLOIOS_CHEST_BOAT.get().asItem());

output.accept(ItemsTreeLeptophloeum.LEPTOPHLOEUM_BOAT.get().asItem());
output.accept(ItemsTreeLeptophloeum.LEPTOPHLOEUM_CHEST_BOAT.get().asItem());

output.accept(ItemsTreePitys.PITYS_BOAT.get().asItem());
output.accept(ItemsTreePitys.PITYS_CHEST_BOAT.get().asItem());

output.accept(ItemsTreeSciadopitys.SCIADOPITYS_BOAT.get().asItem());
output.accept(ItemsTreeSciadopitys.SCIADOPITYS_CHEST_BOAT.get().asItem());

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/github/aechtrob/prehistoricnature/entity/blockentity/ModBlockEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.github.aechtrob.prehistoricnature.world.tree.glossopteris_angustifolia.BlocksTreeGlossopterisA;
import com.github.aechtrob.prehistoricnature.world.tree.lepidodendron.BlocksTreeLepidodendron;
import com.github.aechtrob.prehistoricnature.world.tree.lepidophloios.BlocksTreeLepidophloios;
import com.github.aechtrob.prehistoricnature.world.tree.leptophloeum.BlocksTreeLeptophloeum;
import com.github.aechtrob.prehistoricnature.world.tree.pitys.BlocksTreePitys;
import com.github.aechtrob.prehistoricnature.world.tree.sciadopitys.BlocksTreeSciadopitys;
import com.github.aechtrob.prehistoricnature.world.tree.synchysidendron.BlocksTreeSynchysidendron;
import net.minecraft.core.registries.Registries;
Expand All @@ -35,6 +37,8 @@ public class ModBlockEntities {
BlocksTreeGlossopterisA.GLOSSOPTERISA_SIGN.get(), BlocksTreeGlossopterisA.GLOSSOPTERISA_WALL_SIGN.get(),
BlocksTreeLepidodendron.LEPIDODENDRON_SIGN.get(), BlocksTreeLepidodendron.LEPIDODENDRON_WALL_SIGN.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_SIGN.get(), BlocksTreeLepidophloios.LEPIDOPHLOIOS_WALL_SIGN.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_SIGN.get(), BlocksTreeLeptophloeum.LEPTOPHLOEUM_WALL_SIGN.get(),
BlocksTreePitys.PITYS_SIGN.get(), BlocksTreePitys.PITYS_WALL_SIGN.get(),
BlocksTreeSciadopitys.SCIADOPITYS_SIGN.get(), BlocksTreeSciadopitys.SCIADOPITYS_WALL_SIGN.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_SIGN.get(), BlocksTreeSynchysidendron.SYNCHYSIDENDRON_WALL_SIGN.get()

Expand All @@ -51,6 +55,8 @@ public class ModBlockEntities {
BlocksTreeGlossopterisA.GLOSSOPTERISA_SIGN_HANGING.get(), BlocksTreeGlossopterisA.GLOSSOPTERISA_WALL_SIGN_HANGING.get(),
BlocksTreeLepidodendron.LEPIDODENDRON_SIGN_HANGING.get(), BlocksTreeLepidodendron.LEPIDODENDRON_WALL_SIGN_HANGING.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_SIGN_HANGING.get(), BlocksTreeLepidophloios.LEPIDOPHLOIOS_WALL_SIGN_HANGING.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_SIGN_HANGING.get(), BlocksTreeLeptophloeum.LEPTOPHLOEUM_WALL_SIGN_HANGING.get(),
BlocksTreePitys.PITYS_SIGN_HANGING.get(), BlocksTreePitys.PITYS_WALL_SIGN_HANGING.get(),
BlocksTreeSciadopitys.SCIADOPITYS_SIGN_HANGING.get(), BlocksTreeSciadopitys.SCIADOPITYS_WALL_SIGN_HANGING.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_SIGN_HANGING.get(), BlocksTreeSynchysidendron.SYNCHYSIDENDRON_WALL_SIGN_HANGING.get()

Expand Down Expand Up @@ -82,6 +88,12 @@ public class ModBlockEntities {
BlocksTreeLepidophloios.LEPIDOPHLOIOS_BENCH.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_BRIDGE.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_LITTERBIN.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_BENCH.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_BRIDGE.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_LITTERBIN.get(),
BlocksTreePitys.PITYS_BENCH.get(),
BlocksTreePitys.PITYS_BRIDGE.get(),
BlocksTreePitys.PITYS_LITTERBIN.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_BENCH.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_BRIDGE.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_LITTERBIN.get()
Expand All @@ -108,6 +120,10 @@ public class ModBlockEntities {
BlocksTreeSciadopitys.SCIADOPITYS_PLANTER_2.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_PLANTER_1.get(),
BlocksTreeLepidophloios.LEPIDOPHLOIOS_PLANTER_2.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_PLANTER_1.get(),
BlocksTreeLeptophloeum.LEPTOPHLOEUM_PLANTER_2.get(),
BlocksTreePitys.PITYS_PLANTER_1.get(),
BlocksTreePitys.PITYS_PLANTER_2.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_PLANTER_1.get(),
BlocksTreeSynchysidendron.SYNCHYSIDENDRON_PLANTER_2.get()
)
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/github/aechtrob/prehistoricnature/util/PNWoodTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public class PNWoodTypes {
public static final WoodType GLOSSOPTERISA = WoodType.register(new WoodType(PrehistoricNature.MODID + "glossopteris_angustifolia", BlockSetType.OAK));
public static final WoodType LEPIDODENDRON = WoodType.register(new WoodType(PrehistoricNature.MODID + "lepidodendron", BlockSetType.OAK));
public static final WoodType LEPIDOPHLOIOS = WoodType.register(new WoodType(PrehistoricNature.MODID + "lepidophloios", BlockSetType.OAK));
public static final WoodType LEPTOPHLOEUM = WoodType.register(new WoodType(PrehistoricNature.MODID + "leptophloeum", BlockSetType.OAK));
public static final WoodType PITYS = WoodType.register(new WoodType(PrehistoricNature.MODID + "pitys", BlockSetType.OAK));
public static final WoodType SCIADOPITYS = WoodType.register(new WoodType(PrehistoricNature.MODID + "sciadopitys", BlockSetType.OAK));
public static final WoodType SYNCHYSIDENDRON = WoodType.register(new WoodType(PrehistoricNature.MODID + "synchysidendron", BlockSetType.OAK));
}
2 changes: 2 additions & 0 deletions src/main/java/com/github/aechtrob/prehistoricnature/world/ModConfiguredFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public class ModConfiguredFeatures {
public static final ResourceKey<ConfiguredFeature<?, ?>> GLOSSOPTERISA_TREE = createKey("glossopteris_angustifolia_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> LEPIDODENDRON_TREE = createKey("lepidodendron_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> LEPIDOPHLOIOS_TREE = createKey("lepidophloios_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> LEPTOPHLOEUM_TREE = createKey("leptophloeum_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> PITYS_TREE = createKey("pitys_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> SCIADOPITYS_TREE = createKey("sciadopitys_tree");
public static final ResourceKey<ConfiguredFeature<?, ?>> SYNCHYSIDENDRON_TREE = createKey("synchysidendron_tree");

Expand Down
Loading