mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
More stonecutting recipes
This commit is contained in:
1 parent
febe12e680
commit
9d81772d48
53 files changed
+460
-50
No files matched your search
@@ -265,12 +265,7 @@ public final class ModFluffBlocks {
|
||||
register(r, new BlockModSlab(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX);
|
||||
|
||||
Block.Properties props = Block.Properties.from(Blocks.QUARTZ_BLOCK);
|
||||
String[] variants = {
|
||||
LibBlockNames.QUARTZ_BLAZE, LibBlockNames.QUARTZ_DARK,
|
||||
LibBlockNames.QUARTZ_LAVENDER, LibBlockNames.QUARTZ_MANA,
|
||||
LibBlockNames.QUARTZ_RED, LibBlockNames.QUARTZ_SUNNY
|
||||
};
|
||||
for (String variant : variants) {
|
||||
for (String variant : LibBlockNames.QUARTZ_VARIANTS) {
|
||||
ILexiconable lexicon = (world, pos, player, lex) -> LexiconData.decorativeBlocks;
|
||||
|
||||
base = new BlockModLexiconable(props, lexicon);
|
||||
@@ -281,46 +276,13 @@ public final class ModFluffBlocks {
|
||||
register(r, new BlockModStairs(base.getDefaultState(), props), variant + STAIR_SUFFIX);
|
||||
}
|
||||
|
||||
// elf quartz special
|
||||
ILexiconable elven = (world, pos, player, lex) -> LexiconData.elvenResources;
|
||||
base = new BlockModLexiconable(props, elven);
|
||||
register(r, base, LibBlockNames.QUARTZ_ELF);
|
||||
register(r, new BlockModLexiconable(props, elven), "chiseled_" + LibBlockNames.QUARTZ_ELF);
|
||||
register(r, new BlockSpecialQuartzPillar(props), LibBlockNames.QUARTZ_ELF + "_pillar");
|
||||
register(r, new BlockElfQuartzSlab(props), LibBlockNames.QUARTZ_ELF + SLAB_SUFFIX);
|
||||
register(r, new BlockElfQuartzStairs(base.getDefaultState(), props), LibBlockNames.QUARTZ_ELF + STAIR_SUFFIX);
|
||||
|
||||
props = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
|
||||
|
||||
Block block = new BlockMod(props);
|
||||
register(r, block, "white" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "white" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "white" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
|
||||
block = new BlockMod(props);
|
||||
register(r, block, "black" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "black" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "black" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
|
||||
block = new BlockMod(props);
|
||||
register(r, block, "blue" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
|
||||
block = new BlockMod(props);
|
||||
register(r, block, "red" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "red" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "red" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
|
||||
block = new BlockMod(props);
|
||||
register(r, block, "yellow" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
|
||||
block = new BlockMod(props);
|
||||
register(r, block, "green" + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), "green" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), "green" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
for (String color : LibBlockNames.PAVEMENT_VARIANTS) {
|
||||
Block block = new BlockMod(props);
|
||||
register(r, block, color + LibBlockNames.PAVEMENT_SUFFIX);
|
||||
register(r, new BlockPavementStairs(block.getDefaultState(), props), color + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
|
||||
register(r, new BlockPavementSlab(props), color + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
|
||||
}
|
||||
|
||||
props = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 10).sound(SoundType.STONE);
|
||||
ILexiconable marimorph = (world, pos, player, lex) -> LexiconData.marimorphosis;
|
||||
|
||||
@@ -13,10 +13,11 @@ import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.util.IItemProvider;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.ResourceLocationHelper;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@@ -32,6 +33,47 @@ public class StonecuttingProvider extends RecipeProvider {
|
||||
for(String variant : LibBlockNames.METAMORPHIC_VARIANTS) {
|
||||
registerForMetamorphic(variant, consumer);
|
||||
}
|
||||
|
||||
for(String color : LibBlockNames.PAVEMENT_VARIANTS) {
|
||||
registerForPavement(color, consumer);
|
||||
}
|
||||
|
||||
for(String variant : LibBlockNames.QUARTZ_VARIANTS) {
|
||||
registerForQuartz(variant, consumer);
|
||||
}
|
||||
|
||||
consumer.accept(stonecutting(ModBlocks.shimmerrock, ModFluffBlocks.shimmerrockSlab, 2));
|
||||
consumer.accept(stonecutting(ModBlocks.shimmerrock, ModFluffBlocks.shimmerrockStairs));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockSlab, 2));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockStairs));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockWall));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModBlocks.livingrockBrick));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockBrickSlab, 2));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModFluffBlocks.livingrockBrickStairs));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrock, ModBlocks.livingrockBrickChiseled));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModFluffBlocks.livingrockBrickSlab, 2));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModFluffBlocks.livingrockBrickStairs));
|
||||
consumer.accept(stonecutting(ModBlocks.livingrockBrick, ModBlocks.livingrockBrickChiseled));
|
||||
}
|
||||
|
||||
private static void registerForQuartz(String variant, Consumer<IFinishedRecipe> consumer) {
|
||||
Block base = ForgeRegistries.BLOCKS.getValue(prefix(variant));
|
||||
Block slab = ForgeRegistries.BLOCKS.getValue(prefix(variant + LibBlockNames.SLAB_SUFFIX));
|
||||
Block stairs = ForgeRegistries.BLOCKS.getValue(prefix(variant + LibBlockNames.STAIR_SUFFIX));
|
||||
Block chiseled = ForgeRegistries.BLOCKS.getValue(prefix("chiseled_" + variant));
|
||||
Block pillar = ForgeRegistries.BLOCKS.getValue(prefix(variant + "_pillar"));
|
||||
consumer.accept(stonecutting(base, slab, 2));
|
||||
consumer.accept(stonecutting(base, stairs));
|
||||
consumer.accept(stonecutting(base, chiseled));
|
||||
consumer.accept(stonecutting(base, pillar));
|
||||
}
|
||||
|
||||
private static void registerForPavement(String color, Consumer<IFinishedRecipe> consumer) {
|
||||
Block base = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX));
|
||||
Block slab = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX + LibBlockNames.SLAB_SUFFIX));
|
||||
Block stair = ForgeRegistries.BLOCKS.getValue(prefix(color + LibBlockNames.PAVEMENT_SUFFIX + LibBlockNames.STAIR_SUFFIX));
|
||||
consumer.accept(stonecutting(base, slab, 2));
|
||||
consumer.accept(stonecutting(base, stair));
|
||||
}
|
||||
|
||||
private static void registerForMetamorphic(String variant, Consumer<IFinishedRecipe> consumer) {
|
||||
@@ -63,6 +105,12 @@ public class StonecuttingProvider extends RecipeProvider {
|
||||
consumer.accept(stonecutting(cobble, cobbleWall));
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Botania stonecutting recipes";
|
||||
}
|
||||
|
||||
private static ResourceLocation idFor(IItemProvider a, IItemProvider b) {
|
||||
return prefix("stonecutting/" + a.asItem().getRegistryName().getPath() + "_to_" + b.asItem().getRegistryName().getPath());
|
||||
}
|
||||
|
||||
@@ -127,6 +127,10 @@ public final class LibBlockNames {
|
||||
public static final String BELLOWS = "bellows";
|
||||
public static final String BIFROST_PERM = "bifrost_perm";
|
||||
public static final String PAVEMENT_SUFFIX = "_pavement";
|
||||
public static final String[] PAVEMENT_VARIANTS = {
|
||||
"white", "black", "blue",
|
||||
"red", "yellow", "green"
|
||||
};
|
||||
public static final String CELL_BLOCK = "cell_block";
|
||||
public static final String GAIA_HEAD = "gaia_head";
|
||||
public static final String GAIA_WALL_HEAD = "gaia_wall_head";
|
||||
@@ -197,5 +201,9 @@ public final class LibBlockNames {
|
||||
public static final String QUARTZ_RED = "red_quartz";
|
||||
public static final String QUARTZ_ELF = "elf_quartz";
|
||||
public static final String QUARTZ_SUNNY = "sunny_quartz";
|
||||
public static final String[] QUARTZ_VARIANTS = {
|
||||
QUARTZ_DARK, QUARTZ_MANA, QUARTZ_BLAZE, QUARTZ_LAVENDER,
|
||||
QUARTZ_RED, QUARTZ_ELF, QUARTZ_SUNNY
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user