R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP Aether and Blue Skies wood types

Browse Source
This commit is contained in:
thedarkcolour 2023-11-24 23:39:00 -08:00
parent 89b0c0d63f
commit ff701bb243
9 changed files with 251 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
View File

@ -38,4 +38,6 @@ public class ModIds {
public static final String ARS_NOUVEAU = "ars_nouveau";
public static final String MODEST_FLINT_OVERHAUL = "modestflintoverhaul";
public static final String FACTORIUM = "factorium";
public static final String AETHER = "aether";
public static final String BLUE_SKIES = "blue_skies";
}

36
src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java
View File

@ -162,11 +162,47 @@ public class ExDeorumJeiPlugin implements IModPlugin {
waterCrucibles.add(EItems.DEAD_CRUCIBLE.get());
waterCrucibles.add(EItems.MAGIC_CRUCIBLE.get());
waterCrucibles.add(EItems.UMBRAN_CRUCIBLE.get());
}
if (ModList.get().isLoaded(ModIds.ARS_NOUVEAU)) {
barrels.add(EItems.ARCHWOOD_BARREL.get());
sieves.add(EItems.ARCHWOOD_SIEVE.get());
waterCrucibles.add(EItems.CASCADING_ARCHWOOD_CRUCIBLE.get());
waterCrucibles.add(EItems.BLAZING_ARCHWOOD_CRUCIBLE.get());
waterCrucibles.add(EItems.VEXING_ARCHWOOD_CRUCIBLE.get());
waterCrucibles.add(EItems.FLOURISHING_ARCHWOOD_CRUCIBLE.get());
}
if (ModList.get().isLoaded(ModIds.AETHER)) {
barrels.add(EItems.SKYROOT_BARREL.get());
sieves.add(EItems.SKYROOT_SIEVE.get());
waterCrucibles.add(EItems.SKYROOT_CRUCIBLE.get());
waterCrucibles.add(EItems.GOLDEN_OAK_CRUCIBLE.get());
}
if (ModList.get().isLoaded(ModIds.BLUE_SKIES)) {
barrels.add(EItems.BLUEBRIGHT_BARREL.get());
barrels.add(EItems.STARLIT_BARREL.get());
barrels.add(EItems.FROSTBRIGHT_BARREL.get());
barrels.add(EItems.COMET_BARREL.get());
barrels.add(EItems.LUNAR_BARREL.get());
barrels.add(EItems.DUSK_BARREL.get());
barrels.add(EItems.MAPLE_BARREL.get());
barrels.add(EItems.CRYSTALLIZED_BARREL.get());
sieves.add(EItems.BLUEBRIGHT_SIEVE.get());
sieves.add(EItems.STARLIT_SIEVE.get());
sieves.add(EItems.FROSTBRIGHT_SIEVE.get());
sieves.add(EItems.COMET_SIEVE.get());
sieves.add(EItems.LUNAR_SIEVE.get());
sieves.add(EItems.DUSK_SIEVE.get());
sieves.add(EItems.MAPLE_SIEVE.get());
sieves.add(EItems.CRYSTALLIZED_SIEVE.get());
lavaCrucibles.add(EItems.CRYSTALLIZED_CRUCIBLE.get());
waterCrucibles.add(EItems.BLUEBRIGHT_CRUCIBLE.get());
waterCrucibles.add(EItems.STARLIT_CRUCIBLE.get());
waterCrucibles.add(EItems.FROSTBRIGHT_CRUCIBLE.get());
waterCrucibles.add(EItems.COMET_CRUCIBLE.get());
waterCrucibles.add(EItems.LUNAR_CRUCIBLE.get());
waterCrucibles.add(EItems.DUSK_CRUCIBLE.get());
waterCrucibles.add(EItems.MAPLE_CRUCIBLE.get());
}
for (var barrel : barrels) {
var stack = new ItemStack(barrel);
registration.addRecipeCatalyst(stack, BARREL_COMPOST);

94
src/main/java/thedarkcolour/exdeorum/data/BlockModels.java
View File

@ -25,6 +25,8 @@ import net.minecraftforge.client.model.generators.ConfiguredModel;
import thedarkcolour.exdeorum.registry.EBlocks;
import thedarkcolour.modkit.data.MKBlockModelProvider;
import java.util.function.Supplier;
class BlockModels {
public static void addBlockModels(MKBlockModelProvider models) {
models.simpleBlock(EBlocks.DUST.get());
@ -34,18 +36,18 @@ class BlockModels {
models.simpleBlock(EBlocks.CRUSHED_BLACKSTONE.get());
// Barrels
barrel(models, EBlocks.OAK_BARREL.get(), Blocks.OAK_PLANKS);
barrel(models, EBlocks.SPRUCE_BARREL.get(), Blocks.SPRUCE_PLANKS);
barrel(models, EBlocks.BIRCH_BARREL.get(), Blocks.BIRCH_PLANKS);
barrel(models, EBlocks.JUNGLE_BARREL.get(), Blocks.JUNGLE_PLANKS);
barrel(models, EBlocks.ACACIA_BARREL.get(), Blocks.ACACIA_PLANKS);
barrel(models, EBlocks.DARK_OAK_BARREL.get(), Blocks.DARK_OAK_PLANKS);
barrel(models, EBlocks.MANGROVE_BARREL.get(), Blocks.MANGROVE_PLANKS);
barrel(models, EBlocks.CHERRY_BARREL.get(), Blocks.CHERRY_PLANKS);
barrel(models, EBlocks.BAMBOO_BARREL.get(), Blocks.BAMBOO_PLANKS);
barrel(models, EBlocks.CRIMSON_BARREL.get(), Blocks.CRIMSON_PLANKS);
barrel(models, EBlocks.WARPED_BARREL.get(), Blocks.WARPED_PLANKS);
barrel(models, EBlocks.STONE_BARREL.get(), Blocks.STONE);
barrel(models, EBlocks.OAK_BARREL, Blocks.OAK_PLANKS);
barrel(models, EBlocks.SPRUCE_BARREL, Blocks.SPRUCE_PLANKS);
barrel(models, EBlocks.BIRCH_BARREL, Blocks.BIRCH_PLANKS);
barrel(models, EBlocks.JUNGLE_BARREL, Blocks.JUNGLE_PLANKS);
barrel(models, EBlocks.ACACIA_BARREL, Blocks.ACACIA_PLANKS);
barrel(models, EBlocks.DARK_OAK_BARREL, Blocks.DARK_OAK_PLANKS);
barrel(models, EBlocks.MANGROVE_BARREL, Blocks.MANGROVE_PLANKS);
barrel(models, EBlocks.CHERRY_BARREL, Blocks.CHERRY_PLANKS);
barrel(models, EBlocks.BAMBOO_BARREL, Blocks.BAMBOO_PLANKS);
barrel(models, EBlocks.CRIMSON_BARREL, Blocks.CRIMSON_PLANKS);
barrel(models, EBlocks.WARPED_BARREL, Blocks.WARPED_PLANKS);
barrel(models, EBlocks.STONE_BARREL, Blocks.STONE);
sieve(models, EBlocks.OAK_SIEVE.get(), Blocks.OAK_PLANKS);
sieve(models, EBlocks.SPRUCE_SIEVE.get(), Blocks.SPRUCE_PLANKS);
@ -79,10 +81,12 @@ class BlockModels {
// Mod compat
bopModels(models);
arsNouveauModels(models);
aetherModels(models);
blueSkiesModels(models);
}
private static void arsNouveauModels(MKBlockModelProvider models) {
barrel(models, EBlocks.ARCHWOOD_BARREL.get(), ModCompatData.ARCHWOOD_PLANKS.get());
barrel(models, EBlocks.ARCHWOOD_BARREL, ModCompatData.ARCHWOOD_PLANKS.get());
sieve(models, EBlocks.ARCHWOOD_SIEVE.get(), ModCompatData.ARCHWOOD_PLANKS.get());
@ -92,17 +96,55 @@ class BlockModels {
crucible(models, EBlocks.FLOURISHING_ARCHWOOD_CRUCIBLE.get(), ModCompatData.FLOURISHING_ARCHWOOD_LOG.get());
}
private static void aetherModels(MKBlockModelProvider models) {
barrel(models, EBlocks.SKYROOT_BARREL, ModCompatData.SKYROOT_PLANKS.get());
sieve(models, EBlocks.SKYROOT_SIEVE.get(), ModCompatData.SKYROOT_PLANKS.get());
crucible(models, EBlocks.SKYROOT_CRUCIBLE.get(), ModCompatData.SKYROOT_LOG.get());
crucible(models, EBlocks.GOLDEN_OAK_CRUCIBLE.get(), ModCompatData.GOLDEN_OAK_LOG.get());
}
private static void blueSkiesModels(MKBlockModelProvider models) {
barrel(models, EBlocks.BLUEBRIGHT_BARREL, ModCompatData.BLUEBRIGHT_PLANKS.get());
barrel(models, EBlocks.STARLIT_BARREL, ModCompatData.STARLIT_PLANKS.get());
barrel(models, EBlocks.FROSTBRIGHT_BARREL, ModCompatData.FROSTBRIGHT_PLANKS.get());
barrel(models, EBlocks.COMET_BARREL, ModCompatData.COMET_PLANKS.get());
barrel(models, EBlocks.LUNAR_BARREL, ModCompatData.LUNAR_PLANKS.get());
barrel(models, EBlocks.DUSK_BARREL, ModCompatData.DUSK_PLANKS.get());
barrel(models, EBlocks.MAPLE_BARREL, ModCompatData.MAPLE_PLANKS.get());
barrel(models, EBlocks.CRYSTALLIZED_BARREL, ModCompatData.CRYSTALLIZED_PLANKS.get());
barrel(models, EBlocks.BLUEBRIGHT_SIEVE.get(), ModCompatData.BLUEBRIGHT_PLANKS.get());
barrel(models, EBlocks.STARLIT_SIEVE.get(), ModCompatData.STARLIT_PLANKS.get());
barrel(models, EBlocks.FROSTBRIGHT_SIEVE.get(), ModCompatData.FROSTBRIGHT_PLANKS.get());
barrel(models, EBlocks.COMET_SIEVE.get(), ModCompatData.COMET_PLANKS.get());
barrel(models, EBlocks.LUNAR_SIEVE.get(), ModCompatData.LUNAR_PLANKS.get());
barrel(models, EBlocks.DUSK_SIEVE.get(), ModCompatData.DUSK_PLANKS.get());
barrel(models, EBlocks.MAPLE_SIEVE.get(), ModCompatData.MAPLE_PLANKS.get());
barrel(models, EBlocks.CRYSTALLIZED_SIEVE.get(), ModCompatData.CRYSTALLIZED_PLANKS.get());
crucible(models, EBlocks.BLUEBRIGHT_CRUCIBLE.get(), ModCompatData.BLUEBRIGHT_LOG.get());
crucible(models, EBlocks.STARLIT_CRUCIBLE.get(), ModCompatData.STARLIT_LOG.get());
crucible(models, EBlocks.FROSTBRIGHT_CRUCIBLE.get(), ModCompatData.FROSTBRIGHT_LOG.get());
crucible(models, EBlocks.COMET_CRUCIBLE.get(), ModCompatData.COMET_LOG.get());
crucible(models, EBlocks.LUNAR_CRUCIBLE.get(), ModCompatData.LUNAR_LOG.get());
crucible(models, EBlocks.DUSK_CRUCIBLE.get(), ModCompatData.DUSK_LOG.get());
crucible(models, EBlocks.MAPLE_CRUCIBLE.get(), ModCompatData.MAPLE_LOG.get());
crucible(models, EBlocks.CRYSTALLIZED_CRUCIBLE.get(), ModCompatData.CRYSTALLIZED_LOG.get());
}
private static void bopModels(MKBlockModelProvider models) {
barrel(models, EBlocks.FIR_BARREL.get(), ModCompatData.FIR_PLANKS.get());
barrel(models, EBlocks.REDWOOD_BARREL.get(), ModCompatData.REDWOOD_PLANKS.get());
barrel(models, EBlocks.MAHOGANY_BARREL.get(), ModCompatData.MAHOGANY_PLANKS.get());
barrel(models, EBlocks.JACARANDA_BARREL.get(), ModCompatData.JACARANDA_PLANKS.get());
barrel(models, EBlocks.PALM_BARREL.get(), ModCompatData.PALM_PLANKS.get());
barrel(models, EBlocks.WILLOW_BARREL.get(), ModCompatData.WILLOW_PLANKS.get());
barrel(models, EBlocks.DEAD_BARREL.get(), ModCompatData.DEAD_PLANKS.get());
barrel(models, EBlocks.MAGIC_BARREL.get(), ModCompatData.MAGIC_PLANKS.get());
barrel(models, EBlocks.UMBRAN_BARREL.get(), ModCompatData.UMBRAN_PLANKS.get());
barrel(models, EBlocks.HELLBARK_BARREL.get(), ModCompatData.HELLBARK_PLANKS.get());
barrel(models, EBlocks.FIR_BARREL, ModCompatData.FIR_PLANKS.get());
barrel(models, EBlocks.REDWOOD_BARREL, ModCompatData.REDWOOD_PLANKS.get());
barrel(models, EBlocks.MAHOGANY_BARREL, ModCompatData.MAHOGANY_PLANKS.get());
barrel(models, EBlocks.JACARANDA_BARREL, ModCompatData.JACARANDA_PLANKS.get());
barrel(models, EBlocks.PALM_BARREL, ModCompatData.PALM_PLANKS.get());
barrel(models, EBlocks.WILLOW_BARREL, ModCompatData.WILLOW_PLANKS.get());
barrel(models, EBlocks.DEAD_BARREL, ModCompatData.DEAD_PLANKS.get());
barrel(models, EBlocks.MAGIC_BARREL, ModCompatData.MAGIC_PLANKS.get());
barrel(models, EBlocks.UMBRAN_BARREL, ModCompatData.UMBRAN_PLANKS.get());
barrel(models, EBlocks.HELLBARK_BARREL, ModCompatData.HELLBARK_PLANKS.get());
sieve(models, EBlocks.FIR_SIEVE.get(), ModCompatData.FIR_PLANKS.get());
sieve(models, EBlocks.REDWOOD_SIEVE.get(), ModCompatData.REDWOOD_PLANKS.get());
@ -125,8 +167,6 @@ class BlockModels {
crucible(models, EBlocks.MAGIC_CRUCIBLE.get(), ModCompatData.MAGIC_LOG.get());
crucible(models, EBlocks.UMBRAN_CRUCIBLE.get(), ModCompatData.UMBRAN_LOG.get());
crucible(models, EBlocks.HELLBARK_CRUCIBLE.get(), ModCompatData.HELLBARK_LOG.get());
}
public static void crucible(MKBlockModelProvider models, Block block) {
@ -144,8 +184,8 @@ class BlockModels {
.texture("side", texture);
}
public static void barrel(MKBlockModelProvider models, Block block, Block appearance) {
singleModel(models, block)
public static void barrel(MKBlockModelProvider models, Supplier<? extends Block> block, Block appearance) {
singleModel(models, block.get())
.parent(models.modFile("template_barrel"))
.texture("barrel", models.blockTexture(appearance));
}

11
src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java
View File

@ -126,6 +126,10 @@ public class ModCompatData {
public static RegistryObject<Item> FLOURISHING_ARCHWOOD_LOG_ITEM;
public static RegistryObject<Item> ARCHWOOD_SLAB;
public static RegistryObject<Item> ARCHWOOD_PLANKS_ITEM;
// Aether
public static RegistryObject<Block> SKYROOT_PLANKS;
public static RegistryObject<Item> SKYROOT_SLAB;
public static RegistryObject<Item> SKYROOT_PLANKS_ITEM;
public static void registerModData() {
registerModItems(ModIds.ENDERIO, addItem -> GRAINS_OF_INFINITY = addItem.apply("grains_of_infinity"));
@ -227,6 +231,13 @@ public class ModCompatData {
ARCHWOOD_SLAB = addItem.apply("archwood_slab");
ARCHWOOD_PLANKS_ITEM = addItem.apply("archwood_planks");
});
registerModBlocks(ModIds.AETHER, addBlock -> {
SKYROOT_PLANKS = addBlock.apply("skyroot_planks");
});
registerModItems(ModIds.AETHER, addItem -> {
SKYROOT_SLAB = addItem.apply("skyroot_slab");
SKYROOT_PLANKS_ITEM = addItem.apply("skyroot_planks");
});
}
private static void registerModItems(String modid, Consumer<Function<String, RegistryObject<Item>>> addItems) {

18
src/main/java/thedarkcolour/exdeorum/data/ModTags.java
View File

@ -32,7 +32,6 @@ import net.minecraft.world.level.levelgen.structure.BuiltinStructureSets;
import net.minecraft.world.level.levelgen.structure.StructureSet;
import net.minecraft.world.level.material.Fluid;
import thedarkcolour.exdeorum.ExDeorum;
import thedarkcolour.exdeorum.block.EBlock;
import thedarkcolour.exdeorum.registry.EBlocks;
import thedarkcolour.exdeorum.registry.EFluids;
import thedarkcolour.exdeorum.registry.EItems;
@ -52,21 +51,30 @@ class ModTags {
EBlocks.FIR_BARREL.get(), EBlocks.REDWOOD_BARREL.get(), EBlocks.MAHOGANY_BARREL.get(), EBlocks.JACARANDA_BARREL.get(), EBlocks.PALM_BARREL.get(), EBlocks.WILLOW_BARREL.get(), EBlocks.DEAD_BARREL.get(), EBlocks.MAGIC_BARREL.get(), EBlocks.UMBRAN_BARREL.get(), EBlocks.HELLBARK_BARREL.get(),
// Ars Nouveau barrels
EBlocks.ARCHWOOD_BARREL.get(),
// Aether barrels
EBlocks.SKYROOT_BARREL.get(),
// Blue Skies barrels
EBlocks.BLUEBRIGHT_BARREL.get(), EBlocks.STARLIT_BARREL.get(), EBlocks.FROSTBRIGHT_BARREL.get(), EBlocks.COMET_BARREL.get(), EBlocks.LUNAR_BARREL.get(), EBlocks.DUSK_BARREL.get(), EBlocks.MAPLE_BARREL.get(), EBlocks.CRYSTALLIZED_BARREL.get(),
// Vanilla sieves
EBlocks.OAK_SIEVE.get(), EBlocks.SPRUCE_SIEVE.get(), EBlocks.BIRCH_SIEVE.get(), EBlocks.JUNGLE_SIEVE.get(), EBlocks.ACACIA_SIEVE.get(), EBlocks.DARK_OAK_SIEVE.get(), EBlocks.MANGROVE_SIEVE.get(), EBlocks.CHERRY_SIEVE.get(), EBlocks.BAMBOO_SIEVE.get(), EBlocks.CRIMSON_SIEVE.get(), EBlocks.WARPED_SIEVE.get(),
// BOP sieves
EBlocks.FIR_SIEVE.get(), EBlocks.REDWOOD_SIEVE.get(), EBlocks.MAHOGANY_SIEVE.get(), EBlocks.JACARANDA_SIEVE.get(), EBlocks.PALM_SIEVE.get(), EBlocks.WILLOW_SIEVE.get(), EBlocks.DEAD_SIEVE.get(), EBlocks.MAGIC_SIEVE.get(), EBlocks.UMBRAN_SIEVE.get(), EBlocks.HELLBARK_SIEVE.get(),
// Ars Nouveau sieves
EBlocks.ARCHWOOD_SIEVE.get(),
// Aether sieves
EBlocks.SKYROOT_SIEVE.get(),
// Blue Skies sieves
EBlocks.BLUEBRIGHT_SIEVE.get(), EBlocks.STARLIT_SIEVE.get(), EBlocks.FROSTBRIGHT_SIEVE.get(), EBlocks.COMET_SIEVE.get(), EBlocks.LUNAR_SIEVE.get(), EBlocks.DUSK_SIEVE.get(), EBlocks.MAPLE_SIEVE.get(), EBlocks.CRYSTALLIZED_SIEVE.get(),
// Vanilla crucibles
EBlocks.WARPED_CRUCIBLE.get(), EBlocks.CRIMSON_CRUCIBLE.get(), EBlocks.OAK_CRUCIBLE.get(), EBlocks.SPRUCE_CRUCIBLE.get(), EBlocks.BIRCH_CRUCIBLE.get(), EBlocks.JUNGLE_CRUCIBLE.get(), EBlocks.ACACIA_CRUCIBLE.get(), EBlocks.DARK_OAK_CRUCIBLE.get(), EBlocks.MANGROVE_CRUCIBLE.get(), EBlocks.CHERRY_CRUCIBLE.get(), EBlocks.BAMBOO_CRUCIBLE.get(),
// BOP crucibles
EBlocks.FIR_CRUCIBLE.get(), EBlocks.REDWOOD_CRUCIBLE.get(), EBlocks.MAHOGANY_CRUCIBLE.get(), EBlocks.JACARANDA_CRUCIBLE.get(), EBlocks.PALM_CRUCIBLE.get(), EBlocks.WILLOW_CRUCIBLE.get(), EBlocks.DEAD_CRUCIBLE.get(), EBlocks.MAGIC_CRUCIBLE.get(), EBlocks.UMBRAN_CRUCIBLE.get(), EBlocks.HELLBARK_CRUCIBLE.get(),
// Ars Nouveau crucibles
EBlocks.CASCADING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.BLAZING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.VEXING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.FLOURISHING_ARCHWOOD_CRUCIBLE.get()
EBlocks.CASCADING_ARCHWOOD_CRUCIBLE.get(), EBlocks.BLAZING_ARCHWOOD_CRUCIBLE.get(), EBlocks.VEXING_ARCHWOOD_CRUCIBLE.get(), EBlocks.FLOURISHING_ARCHWOOD_CRUCIBLE.get(),
// Aether crucibles
EBlocks.SKYROOT_CRUCIBLE.get(), EBlocks.GOLDEN_OAK_CRUCIBLE.get(),
// Blue Skies crucibles
EBlocks.BLUEBRIGHT_CRUCIBLE.get(), EBlocks.STARLIT_CRUCIBLE.get(), EBlocks.FROSTBRIGHT_CRUCIBLE.get(), EBlocks.COMET_CRUCIBLE.get(), EBlocks.LUNAR_CRUCIBLE.get(), EBlocks.DUSK_CRUCIBLE.get(), EBlocks.MAPLE_CRUCIBLE.get()
);
tags.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(EBlocks.STONE_BARREL, EBlocks.PORCELAIN_CRUCIBLE, EBlocks.UNFIRED_PORCELAIN_CRUCIBLE);
tags.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(EBlocks.DUST, EBlocks.CRUSHED_NETHERRACK, EBlocks.CRUSHED_END_STONE, EBlocks.CRUSHED_DEEPSLATE, EBlocks.CRUSHED_BLACKSTONE);

18
src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java
View File

@ -144,6 +144,15 @@ public class Recipes {
modUShaped(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.UMBRAN_PLANKS_ITEM, ModCompatData.UMBRAN_SLAB, EItems.UMBRAN_BARREL);
modUShaped(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.HELLBARK_PLANKS_ITEM, ModCompatData.HELLBARK_SLAB, EItems.HELLBARK_BARREL);
modUShaped(recipes, ModIds.ARS_NOUVEAU, ModCompatData.ARCHWOOD_PLANKS_ITEM, ModCompatData.ARCHWOOD_SLAB, EItems.ARCHWOOD_BARREL);
modUShaped(recipes, ModIds.AETHER, ModCompatData.SKYROOT_PLANKS_ITEM, ModCompatData.SKYROOT_SLAB, EItems.SKYROOT_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.BLUEBRIGHT_PLANKS_ITEM, ModCompatData.BLUEBRIGHT_SLAB, EItems.BLUEBRIGHT_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.STARLIT_PLANKS_ITEM, ModCompatData.STARLIT_SLAB, EItems.STARLIT_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.FROSTBRIGHT_PLANKS_ITEM, ModCompatData.FROSTBRIGHT_SLAB, EItems.FROSTBRIGHT_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.COMET_PLANKS_ITEM, ModCompatData.COMET_SLAB, EItems.COMET_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.LUNAR_PLANKS_ITEM, ModCompatData.LUNAR_SLAB, EItems.LUNAR_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.DUSK_PLANKS_ITEM, ModCompatData.DUSK_SLAB, EItems.DUSK_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.MAPLE_PLANKS_ITEM, ModCompatData.MAPLE_SLAB, EItems.MAPLE_BARREL);
modUShaped(recipes, ModIds.BLUE_SKIES, ModCompatData.CRYSTALLIZED_PLANKS_ITEM, ModCompatData.CRYSTALLIZED_SLAB, EItems.CRYSTALLIZED_BARREL);
// Pebbles and ore chunks
recipes.grid2x2(Items.COBBLESTONE, ingredient(EItems.STONE_PEBBLE));
@ -197,6 +206,15 @@ public class Recipes {
modSieve(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.UMBRAN_PLANKS_ITEM, ModCompatData.UMBRAN_SLAB, EItems.UMBRAN_SIEVE);
modSieve(recipes, ModIds.BIOMES_O_PLENTY, ModCompatData.HELLBARK_PLANKS_ITEM, ModCompatData.HELLBARK_SLAB, EItems.HELLBARK_SIEVE);
modSieve(recipes, ModIds.ARS_NOUVEAU, ModCompatData.ARCHWOOD_PLANKS_ITEM, ModCompatData.ARCHWOOD_SLAB, EItems.ARCHWOOD_SIEVE);
modSieve(recipes, ModIds.AETHER, ModCompatData.SKYROOT_PLANKS_ITEM, ModCompatData.SKYROOT_SLAB, EItems.SKYROOT_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.BLUEBRIGHT_PLANKS_ITEM, ModCompatData.BLUEBRIGHT_SLAB, EItems.BLUEBRIGHT_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.STARLIT_PLANKS_ITEM, ModCompatData.STARLIT_SLAB, EItems.STARLIT_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.FROSTBRIGHT_PLANKS_ITEM, ModCompatData.FROSTBRIGHT_SLAB, EItems.FROSTBRIGHT_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.COMET_PLANKS_ITEM, ModCompatData.COMET_SLAB, EItems.COMET_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.LUNAR_PLANKS_ITEM, ModCompatData.LUNAR_SLAB, EItems.LUNAR_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.DUSK_PLANKS_ITEM, ModCompatData.DUSK_SLAB, EItems.DUSK_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.MAPLE_PLANKS_ITEM, ModCompatData.MAPLE_SLAB, EItems.MAPLE_SIEVE);
modSieve(recipes, ModIds.BLUE_SKIES, ModCompatData.CRYSTALLIZED_PLANKS_ITEM, ModCompatData.CRYSTALLIZED_SLAB, EItems.CRYSTALLIZED_SIEVE);
// Meshes
recipes.grid3x3(EItems.STRING_MESH.get(), ingredient(Tags.Items.STRING));

44
src/main/java/thedarkcolour/exdeorum/registry/EBlockEntities.java
View File

@ -23,6 +23,7 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import thedarkcolour.exdeorum.ExDeorum;
import thedarkcolour.exdeorum.block.EBlock;
import thedarkcolour.exdeorum.blockentity.BarrelBlockEntity;
import thedarkcolour.exdeorum.blockentity.InfestedLeavesBlockEntity;
import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity;
@ -38,7 +39,9 @@ public class EBlockEntities {
EBlocks.CRIMSON_CRUCIBLE.get(),
EBlocks.PORCELAIN_CRUCIBLE.get(),
// BOP
EBlocks.HELLBARK_CRUCIBLE.get()
EBlocks.HELLBARK_CRUCIBLE.get(),
// Blue Skies
EBlocks.CRYSTALLIZED_CRUCIBLE.get()
).build(null));
public static final RegistryObject<BlockEntityType<WaterCrucibleBlockEntity>> WATER_CRUCIBLE = BLOCK_ENTITIES.register("water_crucible", () -> BlockEntityType.Builder.of(WaterCrucibleBlockEntity::new,
EBlocks.OAK_CRUCIBLE.get(),
@ -64,7 +67,18 @@ public class EBlockEntities {
EBlocks.CASCADING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.BLAZING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.VEXING_ARCHWOOD_CRUCIBLE.get(),
EBlocks.FLOURISHING_ARCHWOOD_CRUCIBLE.get()
EBlocks.FLOURISHING_ARCHWOOD_CRUCIBLE.get(),
// Aether
EBlocks.SKYROOT_CRUCIBLE.get(),
EBlocks.GOLDEN_OAK_CRUCIBLE.get(),
// Blue Skies
EBlocks.BLUEBRIGHT_CRUCIBLE.get(),
EBlocks.STARLIT_CRUCIBLE.get(),
EBlocks.FROSTBRIGHT_CRUCIBLE.get(),
EBlocks.COMET_CRUCIBLE.get(),
EBlocks.LUNAR_CRUCIBLE.get(),
EBlocks.DUSK_CRUCIBLE.get(),
EBlocks.MAPLE_CRUCIBLE.get()
).build(null));
public static final RegistryObject<BlockEntityType<BarrelBlockEntity>> BARREL = BLOCK_ENTITIES.register("barrel", () -> BlockEntityType.Builder.of(BarrelBlockEntity::new,
EBlocks.OAK_BARREL.get(),
@ -91,7 +105,18 @@ public class EBlockEntities {
EBlocks.UMBRAN_BARREL.get(),
EBlocks.HELLBARK_BARREL.get(),
// Ars Nouveau
EBlocks.ARCHWOOD_BARREL.get()
EBlocks.ARCHWOOD_BARREL.get(),
// Aether
EBlocks.SKYROOT_BARREL.get(),
// Blue Skies
EBlocks.BLUEBRIGHT_BARREL.get(),
EBlocks.STARLIT_BARREL.get(),
EBlocks.FROSTBRIGHT_BARREL.get(),
EBlocks.COMET_BARREL.get(),
EBlocks.LUNAR_BARREL.get(),
EBlocks.DUSK_BARREL.get(),
EBlocks.MAPLE_BARREL.get(),
EBlocks.CRYSTALLIZED_BARREL.get()
).build(null));
public static final RegistryObject<BlockEntityType<SieveBlockEntity>> SIEVE = BLOCK_ENTITIES.register("sieve", () -> BlockEntityType.Builder.of(SieveBlockEntity::new,
EBlocks.OAK_SIEVE.get(),
@ -117,6 +142,17 @@ public class EBlockEntities {
EBlocks.UMBRAN_SIEVE.get(),
EBlocks.HELLBARK_SIEVE.get(),
// Ars Nouveau
EBlocks.ARCHWOOD_SIEVE.get()
EBlocks.ARCHWOOD_SIEVE.get(),
// Aether
EBlocks.SKYROOT_SIEVE.get(),
// Blue Skies
EBlocks.BLUEBRIGHT_SIEVE.get(),
EBlocks.STARLIT_SIEVE.get(),
EBlocks.FROSTBRIGHT_SIEVE.get(),
EBlocks.COMET_SIEVE.get(),
EBlocks.LUNAR_SIEVE.get(),
EBlocks.DUSK_SIEVE.get(),
EBlocks.MAPLE_SIEVE.get(),
EBlocks.CRYSTALLIZED_SIEVE.get()
).build(null));
}

35
src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java
View File

@ -71,6 +71,17 @@ public class EBlocks {
public static final RegistryObject<BarrelBlock> HELLBARK_BARREL = registerBarrel("hellbark_barrel", false, false, MapColor.TERRACOTTA_GRAY);
// Ars Nouveau Barrels
public static final RegistryObject<BarrelBlock> ARCHWOOD_BARREL = registerBarrel("archwood_barrel", false, false, MapColor.COLOR_GRAY);
// Aether Barrels
public static final RegistryObject<BarrelBlock> SKYROOT_BARREL = registerBarrel("skyroot_barrel", false, false, MapColor.WOOD);
// Blue Skies Barrels
public static final RegistryObject<BarrelBlock> BLUEBRIGHT_BARREL = registerBarrel("bluebright_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> STARLIT_BARREL = registerBarrel("starlit_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> FROSTBRIGHT_BARREL = registerBarrel("frostbright_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> COMET_BARREL = registerBarrel("comet_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> LUNAR_BARREL = registerBarrel("lunar_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> DUSK_BARREL = registerBarrel("dusk_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> MAPLE_BARREL = registerBarrel("maple_barrel", false, false, MapColor.WOOD);
public static final RegistryObject<BarrelBlock> CRYSTALLIZED_BARREL = registerBarrel("crystallized_barrel", true, true, MapColor.TERRACOTTA_WHITE);
// Sieves
public static final RegistryObject<SieveBlock> OAK_SIEVE = registerSieve("oak_sieve");
@ -97,6 +108,17 @@ public class EBlocks {
public static final RegistryObject<SieveBlock> HELLBARK_SIEVE = registerSieve("hellbark_sieve");
// Ars Nouveau Sieves
public static final RegistryObject<SieveBlock> ARCHWOOD_SIEVE = registerSieve("archwood_sieve");
// Aether Sieves
public static final RegistryObject<SieveBlock> SKYROOT_SIEVE = registerSieve("skyroot_sieve");
// Blue Skies Sieves
public static final RegistryObject<SieveBlock> BLUEBRIGHT_SIEVE = registerSieve("bluebright_sieve");
public static final RegistryObject<SieveBlock> STARLIT_SIEVE = registerSieve("starlit_sieve");
public static final RegistryObject<SieveBlock> FROSTBRIGHT_SIEVE = registerSieve("frostbright_sieve");
public static final RegistryObject<SieveBlock> COMET_SIEVE = registerSieve("comet_sieve");
public static final RegistryObject<SieveBlock> LUNAR_SIEVE = registerSieve("lunar_sieve");
public static final RegistryObject<SieveBlock> DUSK_SIEVE = registerSieve("dusk_sieve");
public static final RegistryObject<SieveBlock> MAPLE_SIEVE = registerSieve("maple_sieve");
public static final RegistryObject<SieveBlock> CRYSTALLIZED_SIEVE = registerSieve("crystallized_sieve");
// Lava Crucibles
public static final RegistryObject<LavaCrucibleBlock> PORCELAIN_CRUCIBLE = registerLavaCrucible("porcelain_crucible", true, SoundType.STONE);
@ -105,6 +127,8 @@ public class EBlocks {
public static final RegistryObject<UnfiredCrucibleBlock> UNFIRED_PORCELAIN_CRUCIBLE = BLOCKS.register("unfired_porcelain_crucible", () -> new UnfiredCrucibleBlock(of().strength(2.0f)));
// BOP Lava Crucibles
public static final RegistryObject<LavaCrucibleBlock> HELLBARK_CRUCIBLE = registerLavaCrucible("hellbark_crucible", false, SoundType.WOOD);
// Blue Skies Lava Crucibles
public static final RegistryObject<LavaCrucibleBlock> CRYSTALLIZED_CRUCIBLE = registerLavaCrucible("crystallized_crucible", true, SoundType.GLASS);
// Water Crucibles
public static final RegistryObject<WaterCrucibleBlock> OAK_CRUCIBLE = registerWaterCrucible("oak_crucible");
@ -131,6 +155,17 @@ public class EBlocks {
public static final RegistryObject<WaterCrucibleBlock> BLAZING_ARCHWOOD_CRUCIBLE = registerWaterCrucible("red_archwood_crucible");
public static final RegistryObject<WaterCrucibleBlock> VEXING_ARCHWOOD_CRUCIBLE = registerWaterCrucible("purple_archwood_crucible");
public static final RegistryObject<WaterCrucibleBlock> FLOURISHING_ARCHWOOD_CRUCIBLE = registerWaterCrucible("green_archwood_crucible");
// Aether Crucibles
public static final RegistryObject<WaterCrucibleBlock> SKYROOT_CRUCIBLE = registerWaterCrucible("skyroot_crucible");
public static final RegistryObject<WaterCrucibleBlock> GOLDEN_OAK_CRUCIBLE = registerWaterCrucible("golden_oak_crucible");
// Blue Skies Crucibles
public static final RegistryObject<WaterCrucibleBlock> BLUEBRIGHT_CRUCIBLE = registerWaterCrucible("bluebright_crucible");
public static final RegistryObject<WaterCrucibleBlock> STARLIT_CRUCIBLE = registerWaterCrucible("starlit_crucible");
public static final RegistryObject<WaterCrucibleBlock> FROSTBRIGHT_CRUCIBLE = registerWaterCrucible("frostbright_crucible");
public static final RegistryObject<WaterCrucibleBlock> COMET_CRUCIBLE = registerWaterCrucible("comet_crucible");
public static final RegistryObject<WaterCrucibleBlock> LUNAR_CRUCIBLE = registerWaterCrucible("lunar_crucible");
public static final RegistryObject<WaterCrucibleBlock> DUSK_CRUCIBLE = registerWaterCrucible("dusk_crucible");
public static final RegistryObject<WaterCrucibleBlock> MAPLE_CRUCIBLE = registerWaterCrucible("maple_crucible");
// Misc
public static final RegistryObject<InfestedLeavesBlock> INFESTED_LEAVES = BLOCKS.register("infested_leaves", () -> new InfestedLeavesBlock(copy(Blocks.OAK_LEAVES)));

29
src/main/java/thedarkcolour/exdeorum/registry/EItems.java
View File

@ -32,6 +32,7 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import thedarkcolour.exdeorum.ExDeorum;
import thedarkcolour.exdeorum.block.EBlock;
import thedarkcolour.exdeorum.compat.ModIds;
import thedarkcolour.exdeorum.item.*;
import thedarkcolour.exdeorum.recipe.RecipeUtil;
@ -170,6 +171,17 @@ public class EItems {
public static final RegistryObject<BlockItem> HELLBARK_BARREL = registerItemBlock(EBlocks.HELLBARK_BARREL);
// Ars Nouveau Barrels
public static final RegistryObject<BlockItem> ARCHWOOD_BARREL = registerItemBlock(EBlocks.ARCHWOOD_BARREL);
// Aether Barrels
public static final RegistryObject<BlockItem> SKYROOT_BARREL = registerItemBlock(EBlocks.SKYROOT_BARREL);
// Blue Skies Barrels
public static final RegistryObject<BlockItem> BLUEBRIGHT_BARREL = registerItemBlock(EBlocks.BLUEBRIGHT_BARREL);
public static final RegistryObject<BlockItem> STARLIT_BARREL = registerItemBlock(EBlocks.STARLIT_BARREL);
public static final RegistryObject<BlockItem> FROSTBRIGHT_BARREL = registerItemBlock(EBlocks.FROSTBRIGHT_BARREL);
public static final RegistryObject<BlockItem> COMET_BARREL = registerItemBlock(EBlocks.COMET_BARREL);
public static final RegistryObject<BlockItem> LUNAR_BARREL = registerItemBlock(EBlocks.LUNAR_BARREL);
public static final RegistryObject<BlockItem> DUSK_BARREL = registerItemBlock(EBlocks.DUSK_BARREL);
public static final RegistryObject<BlockItem> MAPLE_BARREL = registerItemBlock(EBlocks.MAPLE_BARREL);
public static final RegistryObject<BlockItem> CRYSTALLIZED_BARREL = registerItemBlock(EBlocks.CRYSTALLIZED_BARREL);
// Sieves
public static final RegistryObject<BlockItem> OAK_SIEVE = registerItemBlock(EBlocks.OAK_SIEVE);
@ -306,6 +318,10 @@ public class EItems {
output.accept(VEXING_ARCHWOOD_CRUCIBLE.get());
output.accept(FLOURISHING_ARCHWOOD_CRUCIBLE.get());
}
if (ModList.get().isLoaded(ModIds.AETHER)) {
output.accept(SKYROOT_CRUCIBLE.get());
output.accept(GOLDEN_OAK_CRUCIBLE.get());
}
output.accept(DUST.get());
output.accept(CRUSHED_NETHERRACK.get());
@ -392,5 +408,18 @@ public class EItems {
if (ModList.get().isLoaded(ModIds.ARS_NOUVEAU)) {
output.accept(ARCHWOOD_BARREL.get());
}
if (ModList.get().isLoaded(ModIds.AETHER)) {
output.accept(SKYROOT_BARREL.get());
}
if (ModList.get().isLoaded(ModIds.BLUE_SKIES)) {
output.accept(BLUEBRIGHT_BARREL.get());
output.accept(STARLIT_BARREL.get());
output.accept(FROSTBRIGHT_BARREL.get());
output.accept(COMET_BARREL.get());
output.accept(LUNAR_BARREL.get());
output.accept(DUSK_BARREL.get());
output.accept(MAPLE_BARREL.get());
output.accept(CRYSTALLIZED_BARREL.get());
}
}
}