Skip to content

- add custom block support (Start 1/xx) #5

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

Draft
remplerus wants to merge 7 commits into
base: 1.20.1
Choose a base branch
from
Draft

- add custom block support (Start 1/xx) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
79042ab
- add custom block support (Start 1/xx)
remplerus May 11, 2025
3bcafff
Merge branch '1.20.1' into 1.20.1-customblocks
remplerus May 23, 2025
bd45466
First check, need to register blocks etc tho
remplerus May 25, 2025
86477b7
Merge branch '1.20.1' into 1.20.1-customblocks
remplerus May 25, 2025
29c3cf8
first try to create custom blocks (not working yet as they don't get …
remplerus May 29, 2025
6daba8d
Merge branch '1.20.1' into 1.20.1-customblocks
remplerus May 29, 2025
26ca92c
added first time custom blocks, need to check if i can create block o…
remplerus May 29, 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
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,4 @@ run-data/
!gradle-wrapper.jar
/libs/
/src/generated/resources/.cache/
/.env
/.env
.env
19 changes: 18 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ plugins {

boolean enableJEI = true
boolean enableEMI = true
boolean enableTFC = false
boolean enableTFC = true
boolean enableREI = false

apply plugin: 'org.spongepowered.mixin'
Expand Down Expand Up @@ -46,6 +46,8 @@ minecraft {
runs {
configureEach {
workingDirectory project.file('run')
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

mods {
"${mod_id}" {
Expand Down Expand Up @@ -163,6 +165,21 @@ dependencies {
runtimeOnly fg.deobf("dev.architectury:architectury-forge:9.2.14")
runtimeOnly fg.deobf("me.shedaniel:RoughlyEnoughItems-forge:12.1.785")
}

//Aether
runtimeOnly fg.deobf("curse.maven:aether-255308:6134920")

//BOP
runtimeOnly fg.deobf("curse.maven:terrablender-563928:6290448")
runtimeOnly fg.deobf("curse.maven:glitchcore-955399:5787839")
runtimeOnly fg.deobf("curse.maven:bop-220318:6364065")

//Blue Skies
runtimeOnly fg.deobf("curse.maven:structure_gel-378802:5278429")
runtimeOnly fg.deobf("curse.maven:blue_skies-312918:5010316")

runtimeOnly fg.deobf("curse.maven:ars_nouveau-401955:5894609")

}

tasks.named('processResources', ProcessResources).configure {
Expand Down
64 changes: 64 additions & 0 deletions src/generated/resources/assets/exnihiloadditions/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,82 @@
"block.exnihiloadditions.acacia_barrel": "Acacia Barrel",
"block.exnihiloadditions.acacia_crucible": "Acacia Crucible",
"block.exnihiloadditions.acacia_sieve": "Acacia Sieve",
"block.exnihiloadditions.aether_golden_oak_wooden_crucible": "Golden Oak Wooden Crucible",
"block.exnihiloadditions.aether_skyroot_barrel": "Skyroot Barrel",
"block.exnihiloadditions.aether_skyroot_sieve": "Skyroot Sieve",
"block.exnihiloadditions.aether_skyroot_wooden_crucible": "Skyroot Wooden Crucible",
"block.exnihiloadditions.ars_nouveau_archwood_barrel": "Archwood Barrel",
"block.exnihiloadditions.ars_nouveau_archwood_sieve": "Archwood Sieve",
"block.exnihiloadditions.ars_nouveau_blue_archwood_wooden_crucible": "Blue Archwood Wooden Crucible",
"block.exnihiloadditions.ars_nouveau_green_archwood_wooden_crucible": "Green Archwood Wooden Crucible",
"block.exnihiloadditions.ars_nouveau_purple_archwood_wooden_crucible": "Purple Archwood Wooden Crucible",
"block.exnihiloadditions.ars_nouveau_red_archwood_wooden_crucible": "Red Archwood Wooden Crucible",
"block.exnihiloadditions.ash_barrel": "Ash Barrel",
"block.exnihiloadditions.ash_crucible": "Ash Crucible",
"block.exnihiloadditions.ash_sieve": "Ash Sieve",
"block.exnihiloadditions.aspen_barrel": "Aspen Barrel",
"block.exnihiloadditions.aspen_crucible": "Aspen Crucible",
"block.exnihiloadditions.aspen_sieve": "Aspen Sieve",
"block.exnihiloadditions.biomesoplenty_dead_barrel": "Dead Barrel",
"block.exnihiloadditions.biomesoplenty_dead_sieve": "Dead Sieve",
"block.exnihiloadditions.biomesoplenty_dead_wooden_crucible": "Dead Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_fir_barrel": "Fir Barrel",
"block.exnihiloadditions.biomesoplenty_fir_sieve": "Fir Sieve",
"block.exnihiloadditions.biomesoplenty_fir_wooden_crucible": "Fir Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_hellbark_fired_crucible": "Hellbark Fired Crucible",
"block.exnihiloadditions.biomesoplenty_hellbark_sieve": "Hellbark Sieve",
"block.exnihiloadditions.biomesoplenty_hellbark_stone_barrel": "Hellbark Stone Barrel",
"block.exnihiloadditions.biomesoplenty_jacaranda_barrel": "Jacaranda Barrel",
"block.exnihiloadditions.biomesoplenty_jacaranda_sieve": "Jacaranda Sieve",
"block.exnihiloadditions.biomesoplenty_jacaranda_wooden_crucible": "Jacaranda Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_magic_barrel": "Magic Barrel",
"block.exnihiloadditions.biomesoplenty_magic_sieve": "Magic Sieve",
"block.exnihiloadditions.biomesoplenty_magic_wooden_crucible": "Magic Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_mahogany_barrel": "Mahogany Barrel",
"block.exnihiloadditions.biomesoplenty_mahogany_sieve": "Mahogany Sieve",
"block.exnihiloadditions.biomesoplenty_mahogany_wooden_crucible": "Mahogany Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_palm_barrel": "Palm Barrel",
"block.exnihiloadditions.biomesoplenty_palm_sieve": "Palm Sieve",
"block.exnihiloadditions.biomesoplenty_palm_wooden_crucible": "Palm Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_redwood_barrel": "Redwood Barrel",
"block.exnihiloadditions.biomesoplenty_redwood_sieve": "Redwood Sieve",
"block.exnihiloadditions.biomesoplenty_redwood_wooden_crucible": "Redwood Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_umbran_barrel": "Umbran Barrel",
"block.exnihiloadditions.biomesoplenty_umbran_sieve": "Umbran Sieve",
"block.exnihiloadditions.biomesoplenty_umbran_wooden_crucible": "Umbran Wooden Crucible",
"block.exnihiloadditions.biomesoplenty_willow_barrel": "Willow Barrel",
"block.exnihiloadditions.biomesoplenty_willow_sieve": "Willow Sieve",
"block.exnihiloadditions.biomesoplenty_willow_wooden_crucible": "Willow Wooden Crucible",
"block.exnihiloadditions.birch_barrel": "Birch Barrel",
"block.exnihiloadditions.birch_crucible": "Birch Crucible",
"block.exnihiloadditions.birch_sieve": "Birch Sieve",
"block.exnihiloadditions.blackwood_barrel": "Blackwood Barrel",
"block.exnihiloadditions.blackwood_crucible": "Blackwood Crucible",
"block.exnihiloadditions.blackwood_sieve": "Blackwood Sieve",
"block.exnihiloadditions.blueskies_bluebright_barrel": "Bluebright Barrel",
"block.exnihiloadditions.blueskies_bluebright_sieve": "Bluebright Sieve",
"block.exnihiloadditions.blueskies_bluebright_wooden_crucible": "Bluebright Wooden Crucible",
"block.exnihiloadditions.blueskies_comet_barrel": "Comet Barrel",
"block.exnihiloadditions.blueskies_comet_sieve": "Comet Sieve",
"block.exnihiloadditions.blueskies_comet_wooden_crucible": "Comet Wooden Crucible",
"block.exnihiloadditions.blueskies_crystallized_fired_crucible": "Crystallized Fired Crucible",
"block.exnihiloadditions.blueskies_crystallized_sieve": "Crystallized Sieve",
"block.exnihiloadditions.blueskies_crystallized_stone_barrel": "Crystallized Stone Barrel",
"block.exnihiloadditions.blueskies_dusk_barrel": "Dusk Barrel",
"block.exnihiloadditions.blueskies_dusk_sieve": "Dusk Sieve",
"block.exnihiloadditions.blueskies_dusk_wooden_crucible": "Dusk Wooden Crucible",
"block.exnihiloadditions.blueskies_frostbright_barrel": "Frostbright Barrel",
"block.exnihiloadditions.blueskies_frostbright_sieve": "Frostbright Sieve",
"block.exnihiloadditions.blueskies_frostbright_wooden_crucible": "Frostbright Wooden Crucible",
"block.exnihiloadditions.blueskies_lunar_barrel": "Lunar Barrel",
"block.exnihiloadditions.blueskies_lunar_sieve": "Lunar Sieve",
"block.exnihiloadditions.blueskies_lunar_wooden_crucible": "Lunar Wooden Crucible",
"block.exnihiloadditions.blueskies_maple_barrel": "Maple Barrel",
"block.exnihiloadditions.blueskies_maple_sieve": "Maple Sieve",
"block.exnihiloadditions.blueskies_maple_wooden_crucible": "Maple Wooden Crucible",
"block.exnihiloadditions.blueskies_starlit_barrel": "Starlit Barrel",
"block.exnihiloadditions.blueskies_starlit_sieve": "Starlit Sieve",
"block.exnihiloadditions.blueskies_starlit_wooden_crucible": "Starlit Wooden Crucible",
"block.exnihiloadditions.chestnut_barrel": "Chestnut Barrel",
"block.exnihiloadditions.chestnut_crucible": "Chestnut Crucible",
"block.exnihiloadditions.chestnut_sieve": "Chestnut Sieve",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/rempler/exnihiloadditions/EXNACreativeModeTabs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

public class EXNACreativeModeTabs {

private static final CreativeModeTabRegistry CREATIVE_MODE_TABS = new CreativeModeTabRegistry(ExNihiloAdditions.MODID);
private static final CreativeModeTabRegistry CREATIVE_MODE_TABS = new CreativeModeTabRegistry(ExNihiloAdditions.ModIds.MODID);

public static List<CreativeModeTabDefinition> getDefinitions() {
return CREATIVE_MODE_TABS.getRegistry();
Expand Down
102 changes: 64 additions & 38 deletions src/main/java/com/rempler/exnihiloadditions/ExNihiloAdditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
package com.rempler.exnihiloadditions;

import com.rempler.exnihiloadditions.api.DefaultItems;
import com.rempler.exnihiloadditions.compat.emi.client.EXAEMIClientSetup;
import com.rempler.exnihiloadditions.compat.tfc.EXNATFCBlockEntites;
import com.rempler.exnihiloadditions.compat.tfc.EXNATFCBlocks;
import com.rempler.exnihiloadditions.compat.tfc.EXNATFCItems;
import com.rempler.exnihiloadditions.compat.tfc.client.EXNATFCClientSetup;
import com.rempler.exnihiloadditions.registers.EXABlockEntities;
import com.rempler.exnihiloadditions.registers.EXABlocks;
import com.rempler.exnihiloadditions.registers.EXAItems;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.RegisterEvent;
import novamachina.novacore.bootstrap.ForgeBlockEntityTypeRegistry;
import novamachina.novacore.bootstrap.ForgeBlockRegistry;
import novamachina.novacore.bootstrap.ForgeCreativeModeTabRegistry;
import novamachina.novacore.bootstrap.ForgeItemRegistry;
import novamachina.novacore.world.item.CreativeModeTabDefinition;
import novamachina.novacore.world.item.ItemDefinition;
import novamachina.novacore.world.level.block.BlockDefinition;
import novamachina.novacore.world.level.block.BlockEntityTypeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Mod(ExNihiloAdditions.MODID)
@Mod(ExNihiloAdditions.ModIds.MODID)
public class ExNihiloAdditions {
public static final Logger LOGGER = LoggerFactory.getLogger("ExNihiloAdditions");
public static final String MODID = "exnihiloadditions";
public static boolean isTFCLoaded = ModList.get().isLoaded("tfc");
public static boolean isEMILoaded = ModList.get().isLoaded("emi");
public static boolean isTFCLoaded = ModList.get().isLoaded(ModIds.TFC);
public static boolean isEMILoaded = ModList.get().isLoaded(ModIds.EMI);

public static ResourceLocation rl(String path) {
return new ResourceLocation(MODID, path);
return new ResourceLocation(ModIds.MODID, path);
}

public ExNihiloAdditions() {
Expand All @@ -44,43 +44,69 @@ public ExNihiloAdditions() {
LOGGER.info("EMI is loaded, registering EMI compat");
EXAEMIClientSetup.register(eventBus);
}
EXAItems.ITEMS.register(eventBus);
EXABlocks.BLOCKS.register(eventBus);
EXABlockEntities.BLOCK_ENTITIES.register(eventBus);

FMLJavaModLoadingContext.get()
.getModEventBus()
.addListener((RegisterEvent event) -> {
if (event.getRegistryKey().equals(BuiltInRegistries.BLOCK.key())) {
ForgeBlockRegistry registry = new ForgeBlockRegistry();
if (isTFCLoaded) {
for (BlockDefinition<?> definition : EXNATFCBlocks.getDefinitions()) {
registry.register(definition);
}
}
}
if (event.getRegistryKey().equals(BuiltInRegistries.BLOCK_ENTITY_TYPE.key())) {
ForgeBlockEntityTypeRegistry registry = new ForgeBlockEntityTypeRegistry();
if (isTFCLoaded) {
for (BlockEntityTypeDefinition<?> definition : EXNATFCBlockEntites.getDefinitions()) {
registry.register(definition);
}
.getModEventBus()
.addListener((RegisterEvent event) -> {
DefaultItems.registerItems();
if (event.getRegistryKey().equals(BuiltInRegistries.BLOCK.key())) {
ForgeBlockRegistry registry = new ForgeBlockRegistry();
if (isTFCLoaded) {
for (BlockDefinition<?> definition : EXNATFCBlocks.getDefinitions()) {
registry.register(definition);
}
}
if (event.getRegistryKey().equals(BuiltInRegistries.ITEM.key())) {
ForgeItemRegistry registry = new ForgeItemRegistry();
if (isTFCLoaded) {
for (BlockDefinition<?> definition : EXNATFCBlocks.getDefinitions()) {
registry.register(definition);
}
for (ItemDefinition<?> definition : EXNATFCItems.getDefinitions()) {
registry.register(definition);
}
//for (BlockDefinition<?> definition : EXABlocks.getDefinitions()) {
// registry.register(definition);
//}
}
//if (event.getRegistryKey().equals(BuiltInRegistries.BLOCK_ENTITY_TYPE.key())) {
// ForgeBlockEntityTypeRegistry registry = new ForgeBlockEntityTypeRegistry();
// if (isTFCLoaded) {
// for (BlockEntityTypeDefinition<?> definition : EXNATFCBlockEntites.getDefinitions()) {
// registry.register(definition);
// }
// }
// for (BlockEntityTypeDefinition<?> definition : EXABlockEntities.getDefinitions()) {
// registry.register(definition);
// }
//}
if (event.getRegistryKey().equals(BuiltInRegistries.ITEM.key())) {
ForgeItemRegistry registry = new ForgeItemRegistry();
if (isTFCLoaded) {
for (BlockDefinition<?> definition : EXNATFCBlocks.getDefinitions()) {
registry.register(definition);
}
}
if (event.getRegistryKey().equals(BuiltInRegistries.CREATIVE_MODE_TAB.key())) {
ForgeCreativeModeTabRegistry registry = new ForgeCreativeModeTabRegistry();
for (CreativeModeTabDefinition definition : EXNACreativeModeTabs.getDefinitions()) {
for (ItemDefinition<?> definition : EXNATFCItems.getDefinitions()) {
registry.register(definition);
}
}
});
//for (BlockDefinition<?> definition : EXABlocks.getDefinitions()) {
// registry.register(definition);
//}
//for (ItemDefinition<?> definition : EXAItems.getDefinitions()) {
// registry.register(definition);
//}
}
if (event.getRegistryKey().equals(BuiltInRegistries.CREATIVE_MODE_TAB.key())) {
ForgeCreativeModeTabRegistry registry = new ForgeCreativeModeTabRegistry();
for (CreativeModeTabDefinition definition : EXNACreativeModeTabs.getDefinitions()) {
registry.register(definition);
}
}
});
}

public static class ModIds {
public static final String MODID = "exnihiloadditions";
public static final String TFC = "tfc";
public static final String EMI = "emi";
public static final String BIOMES_O_PLENTY = "biomesoplenty";
public static final String ARS_NOUVEAU = "ars_nouveau";
public static final String BLUE_SKIES = "blueskies";
public static final String AETHER = "aether";
}
}
Loading