MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] Migrated to BCLRecipeBuilder

Browse source
This commit is contained in:
Frank 2022-08-02 13:12:14 +02:00
parent daa409af72
commit f19d5345b0
11 changed files with 1062 additions and 1097 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/betterx/betterend/complexmaterials/ColoredMaterial.java
View file

@ -1,6 +1,6 @@
package org.betterx.betterend.complexmaterials; package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.recipes.GridRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.BlocksHelper;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
@ -42,7 +42,7 @@ public class ColoredMaterial {
Block block = constructor.apply(FabricBlockSettings.copyOf(source).mapColor(MaterialColor.COLOR_BLACK)); Block block = constructor.apply(FabricBlockSettings.copyOf(source).mapColor(MaterialColor.COLOR_BLACK));
EndBlocks.registerBlock(blockName, block); EndBlocks.registerBlock(blockName, block);
if (craftEight) { if (craftEight) {
GridRecipe.make(BetterEnd.MOD_ID, blockName, block) BCLRecipeBuilder.crafting(BetterEnd.makeID(blockName), block)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(8) .setOutputCount(8)
.setShape("###", "#D#", "###") .setShape("###", "#D#", "###")
@ -50,7 +50,7 @@ public class ColoredMaterial {
.addMaterial('D', dyes.get(color)) .addMaterial('D', dyes.get(color))
.build(); .build();
} else { } else {
GridRecipe.make(BetterEnd.MOD_ID, blockName, block) BCLRecipeBuilder.crafting(BetterEnd.makeID(blockName), block)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#D") .setList("#D")
.addMaterial('#', source) .addMaterial('#', source)

22
src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
View file

@ -3,7 +3,7 @@ package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.blocks.BaseSlabBlock; import org.betterx.bclib.blocks.BaseSlabBlock;
import org.betterx.bclib.blocks.BaseStairsBlock; import org.betterx.bclib.blocks.BaseStairsBlock;
import org.betterx.bclib.blocks.BaseWallBlock; import org.betterx.bclib.blocks.BaseWallBlock;
import org.betterx.bclib.recipes.GridRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.blocks.EndPedestal; import org.betterx.betterend.blocks.EndPedestal;
import org.betterx.betterend.blocks.basis.LitBaseBlock; import org.betterx.betterend.blocks.basis.LitBaseBlock;
@ -47,56 +47,56 @@ public class CrystalSubblocksMaterial {
brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks)); brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks));
// Recipes // // Recipes //
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks", bricks) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', source) .addMaterial('#', source)
.setGroup("end_bricks") .setGroup("end_bricks")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_polished", polished) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_polished"), polished)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', bricks) .addMaterial('#', bricks)
.setGroup("end_tile") .setGroup("end_tile")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_tiles", tiles) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_tiles"), tiles)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', polished) .addMaterial('#', polished)
.setGroup("end_small_tile") .setGroup("end_small_tile")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_pillar", pillar) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_pillar"), pillar)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("#", "#") .setShape("#", "#")
.addMaterial('#', slab) .addMaterial('#', slab)
.setGroup("end_pillar") .setGroup("end_pillar")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_stairs", stairs) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_stairs"), stairs)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.addMaterial('#', source) .addMaterial('#', source)
.setGroup("end_stone_stairs") .setGroup("end_stone_stairs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_slab", slab) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_slab"), slab)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###") .setShape("###")
.addMaterial('#', source) .addMaterial('#', source)
.setGroup("end_stone_slabs") .setGroup("end_stone_slabs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_stairs", brick_stairs) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_stairs"), brick_stairs)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.addMaterial('#', bricks) .addMaterial('#', bricks)
.setGroup("end_stone_stairs") .setGroup("end_stone_stairs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_slab", brick_slab) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_slab"), brick_slab)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###") .setShape("###")
@ -104,14 +104,14 @@ public class CrystalSubblocksMaterial {
.setGroup("end_stone_slabs") .setGroup("end_stone_slabs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_wall", wall) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_wall"), wall)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###", "###") .setShape("###", "###")
.addMaterial('#', source) .addMaterial('#', source)
.setGroup("end_wall") .setGroup("end_wall")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_wall", brick_wall) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_wall"), brick_wall)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###", "###") .setShape("###", "###")

114
src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
View file

@ -6,10 +6,7 @@ import org.betterx.bclib.items.tool.BaseAxeItem;
import org.betterx.bclib.items.tool.BaseHoeItem; import org.betterx.bclib.items.tool.BaseHoeItem;
import org.betterx.bclib.items.tool.BaseShovelItem; import org.betterx.bclib.items.tool.BaseShovelItem;
import org.betterx.bclib.items.tool.BaseSwordItem; import org.betterx.bclib.items.tool.BaseSwordItem;
import org.betterx.bclib.recipes.AnvilRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.bclib.recipes.FurnaceRecipe;
import org.betterx.bclib.recipes.GridRecipe;
import org.betterx.bclib.recipes.SmithingTableRecipe;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.blocks.BulbVineLanternBlock; import org.betterx.betterend.blocks.BulbVineLanternBlock;
import org.betterx.betterend.blocks.BulbVineLanternColoredBlock; import org.betterx.betterend.blocks.BulbVineLanternColoredBlock;
@ -19,7 +16,6 @@ import org.betterx.betterend.config.Configs;
import org.betterx.betterend.item.EndArmorItem; import org.betterx.betterend.item.EndArmorItem;
import org.betterx.betterend.item.tool.EndHammerItem; import org.betterx.betterend.item.tool.EndHammerItem;
import org.betterx.betterend.item.tool.EndPickaxe; import org.betterx.betterend.item.tool.EndPickaxe;
import org.betterx.betterend.recipe.builders.AlloyingRecipeBuilder;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems; import org.betterx.betterend.registry.EndItems;
import org.betterx.worlds.together.tag.v3.TagManager; import org.betterx.worlds.together.tag.v3.TagManager;
@ -242,42 +238,45 @@ public class MetalMaterial {
); );
if (hasOre) { if (hasOre) {
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_ingot_furnace_ore", ore, ingot) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_ingot_furnace_ore"), ingot)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ore)
.setGroup("end_ingot") .setGroup("end_ingot")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_ingot_furnace_raw", rawOre, ingot) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_ingot_furnace_raw"), ingot)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(rawOre)
.setGroup("end_ingot") .setGroup("end_ingot")
.buildWithBlasting(); .buildWithBlasting();
AlloyingRecipeBuilder.create(name + "_ingot_alloy") BCLRecipeBuilder.alloying(BetterEnd.makeID(name + "_ingot_alloy"), ingot)
.checkConfig(Configs.RECIPE_CONFIG)
.setInput(alloyingOre, alloyingOre) .setInput(alloyingOre, alloyingOre)
.setOutput(ingot, 3) .setOutputCount(3)
.setExpiriense(2.1F) .setExperience(2.1F)
.build(); .build();
} }
// Basic recipes // Basic recipes
GridRecipe.make(BetterEnd.MOD_ID, name + "_ingot_from_nuggets", ingot) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_ingot_from_nuggets"), ingot)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###") .setShape("###", "###", "###")
.addMaterial('#', nugget) .addMaterial('#', nugget)
.setGroup("end_metal_ingots_nug") .setGroup("end_metal_ingots_nug")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_nuggets_from_ingot", nugget) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_nuggets_from_ingot"), nugget)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(9) .setOutputCount(9)
.setList("#") .setList("#")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_nuggets_ing") .setGroup("end_metal_nuggets_ing")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_block", block) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_block"), block)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###") .setShape("###", "###", "###")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_blocks") .setGroup("end_metal_blocks")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_ingot_from_block", ingot) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_ingot_from_block"), ingot)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(9) .setOutputCount(9)
.setList("#") .setList("#")
@ -286,68 +285,68 @@ public class MetalMaterial {
.build(); .build();
// Block recipes // Block recipes
GridRecipe.make(BetterEnd.MOD_ID, name + "_tile", tile) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_tile"), tile)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', block) .addMaterial('#', block)
.setGroup("end_metal_tiles") .setGroup("end_metal_tiles")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bars", bars) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bars"), bars)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(16) .setOutputCount(16)
.setShape("###", "###") .setShape("###", "###")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_bars") .setGroup("end_metal_bars")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_pressure_plate", pressurePlate) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_pressure_plate"), pressurePlate)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##") .setShape("##")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_plates") .setGroup("end_metal_plates")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_door", door) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_door"), door)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(3) .setOutputCount(3)
.setShape("##", "##", "##") .setShape("##", "##", "##")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_doors") .setGroup("end_metal_doors")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_trapdoor", trapdoor) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_trapdoor"), trapdoor)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.setGroup("end_metal_trapdoors") .setGroup("end_metal_trapdoors")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_stairs", stairs) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_stairs"), stairs)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.addMaterial('#', block, tile) .addMaterial('#', block, tile)
.setGroup("end_metal_stairs") .setGroup("end_metal_stairs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_slab", slab) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_slab"), slab)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###") .setShape("###")
.addMaterial('#', block, tile) .addMaterial('#', block, tile)
.setGroup("end_metal_slabs") .setGroup("end_metal_slabs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_chain", chain) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_chain"), chain)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("N", "#", "N") .setShape("N", "#", "N")
.addMaterial('#', ingot) .addMaterial('#', ingot)
.addMaterial('N', nugget) .addMaterial('N', nugget)
.setGroup("end_metal_chain") .setGroup("end_metal_chain")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_anvil", anvilBlock) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_anvil"), anvilBlock)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", " I ", "III") .setShape("###", " I ", "III")
.addMaterial('#', block, tile) .addMaterial('#', block, tile)
.addMaterial('I', ingot) .addMaterial('I', ingot)
.setGroup("end_metal_anvil") .setGroup("end_metal_anvil")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bulb_lantern", bulb_lantern) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bulb_lantern"), bulb_lantern)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("C", "I", "#") .setShape("C", "I", "#")
.addMaterial('C', chain) .addMaterial('C', chain)
@ -355,7 +354,7 @@ public class MetalMaterial {
.addMaterial('#', EndItems.GLOWING_BULB) .addMaterial('#', EndItems.GLOWING_BULB)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_chandelier", chandelier) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_chandelier"), chandelier)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("I#I", " # ") .setShape("I#I", " # ")
.addMaterial('#', ingot) .addMaterial('#', ingot)
@ -364,160 +363,147 @@ public class MetalMaterial {
.build(); .build();
// Tools & armor into nuggets // Tools & armor into nuggets
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_axe_nugget", axe, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_axe_nugget"), nugget).setInput(axe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_hoe_nugget", hoe, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_hoe_nugget"), nugget).setInput(hoe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_pickaxe_nugget", pickaxe, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_pickaxe_nugget"), nugget).setInput(pickaxe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_sword_nugget", sword, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_sword_nugget"), nugget).setInput(sword)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_hammer_nugget", hammer, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_hammer_nugget"), nugget).setInput(hammer)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_helmet_nugget", helmet, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_helmet_nugget"), nugget).setInput(helmet)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_chestplate_nugget", chestplate, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_chestplate_nugget"), nugget).setInput(chestplate)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_leggings_nugget", leggings, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_leggings_nugget"), nugget).setInput(leggings)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
FurnaceRecipe.make(BetterEnd.MOD_ID, name + "_boots_nugget", boots, nugget) BCLRecipeBuilder.smelting(BetterEnd.makeID(name + "_boots_nugget"), nugget).setInput(boots)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setGroup("end_nugget") .setGroup("end_nugget")
.buildWithBlasting(); .buildWithBlasting();
// Tool parts from ingots // Tool parts from ingots
AnvilRecipe.create(name + "_shovel_head") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_shovel_head"), shovelHead)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setOutput(shovelHead)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
AnvilRecipe.create(name + "_pickaxe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_pickaxe_head"), pickaxeHead)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setInputCount(3) .setInputCount(3)
.setOutput(pickaxeHead)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
AnvilRecipe.create(name + "_axe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_axe_head"), axeHead)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setInputCount(3) .setInputCount(3)
.setOutput(axeHead)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
AnvilRecipe.create(name + "_hoe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_hoe_head"), hoeHead)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setInputCount(2) .setInputCount(2)
.setOutput(hoeHead)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
AnvilRecipe.create(name + "_sword_blade") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_sword_blade"), swordBlade)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setOutput(swordBlade)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
AnvilRecipe.create(name + "_forged_plate") BCLRecipeBuilder.anvil(BetterEnd.makeID(name + "_forged_plate"), forgedPlate)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(ingot) .setInput(ingot)
.setOutput(forgedPlate)
.setAnvilLevel(anvilAndToolLevel) .setAnvilLevel(anvilAndToolLevel)
.setToolLevel(level) .setToolLevel(level)
.setDamage(level) .setDamage(level)
.build(); .build();
// Tools from parts // Tools from parts
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_hammer") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_hammer"), hammer)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(hammer)
.setBase(block) .setBase(block)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_axe") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_axe"), axe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(axe)
.setBase(axeHead) .setBase(axeHead)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_pickaxe") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_pickaxe"), pickaxe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(pickaxe)
.setBase(pickaxeHead) .setBase(pickaxeHead)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_hoe") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_hoe"), hoe)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(hoe)
.setBase(hoeHead) .setBase(hoeHead)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_sword_handle") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_sword_handle"), swordHandle)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(swordHandle)
.setBase(ingot) .setBase(ingot)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_sword") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_sword"), sword)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(sword)
.setBase(swordBlade) .setBase(swordBlade)
.setAddition(swordHandle) .setAddition(swordHandle)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, name + "_shovel") BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_shovel"), shovel)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(shovel)
.setBase(shovelHead) .setBase(shovelHead)
.setAddition(Items.STICK) .setAddition(Items.STICK)
.build(); .build();
// Armor crafting // Armor crafting
GridRecipe.make(BetterEnd.MOD_ID, name + "_helmet", helmet) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_helmet"), helmet)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "# #") .setShape("###", "# #")
.addMaterial('#', forgedPlate) .addMaterial('#', forgedPlate)
.setGroup("end_metal_helmets") .setGroup("end_metal_helmets")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_chestplate", chestplate) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_chestplate"), chestplate)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("# #", "###", "###") .setShape("# #", "###", "###")
.addMaterial('#', forgedPlate) .addMaterial('#', forgedPlate)
.setGroup("end_metal_chestplates") .setGroup("end_metal_chestplates")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_leggings", leggings) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_leggings"), leggings)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "# #", "# #") .setShape("###", "# #", "# #")
.addMaterial('#', forgedPlate) .addMaterial('#', forgedPlate)
.setGroup("end_metal_leggings") .setGroup("end_metal_leggings")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_boots", boots) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_boots"), boots)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("# #", "# #") .setShape("# #", "# #")
.addMaterial('#', forgedPlate) .addMaterial('#', forgedPlate)

32
src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
View file

@ -1,7 +1,7 @@
package org.betterx.betterend.complexmaterials; package org.betterx.betterend.complexmaterials;
import org.betterx.bclib.blocks.*; import org.betterx.bclib.blocks.*;
import org.betterx.bclib.recipes.GridRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.blocks.EndPedestal; import org.betterx.betterend.blocks.EndPedestal;
import org.betterx.betterend.blocks.FlowerPotBlock; import org.betterx.betterend.blocks.FlowerPotBlock;
@ -70,56 +70,56 @@ public class StoneMaterial {
flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks)); flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks));
// Recipes // // Recipes //
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks", bricks) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_bricks") .setGroup("end_bricks")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_polished", polished) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_polished"), polished)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', bricks) .addMaterial('#', bricks)
.setGroup("end_tile") .setGroup("end_tile")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_tiles", tiles) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_tiles"), tiles)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', polished) .addMaterial('#', polished)
.setGroup("end_small_tile") .setGroup("end_small_tile")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_pillar", pillar) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_pillar"), pillar)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("#", "#") .setShape("#", "#")
.addMaterial('#', slab) .addMaterial('#', slab)
.setGroup("end_pillar") .setGroup("end_pillar")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_stairs", stairs) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_stairs"), stairs)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_stone_stairs") .setGroup("end_stone_stairs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_slab", slab) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_slab"), slab)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###") .setShape("###")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_stone_slabs") .setGroup("end_stone_slabs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_stairs", brickStairs) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_stairs"), brickStairs)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.addMaterial('#', bricks) .addMaterial('#', bricks)
.setGroup("end_stone_stairs") .setGroup("end_stone_stairs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_slab", brickSlab) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_slab"), brickSlab)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###") .setShape("###")
@ -127,14 +127,14 @@ public class StoneMaterial {
.setGroup("end_stone_slabs") .setGroup("end_stone_slabs")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_wall", wall) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_wall"), wall)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###", "###") .setShape("###", "###")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_wall") .setGroup("end_wall")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_bricks_wall", brickWall) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks_wall"), brickWall)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("###", "###") .setShape("###", "###")
@ -142,32 +142,32 @@ public class StoneMaterial {
.setGroup("end_wall") .setGroup("end_wall")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_button", button) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_button"), button)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_stone_buttons") .setGroup("end_stone_buttons")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_pressure_plate", pressurePlate) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_pressure_plate"), pressurePlate)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##") .setShape("##")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_stone_plates") .setGroup("end_stone_plates")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_lantern", lantern) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_lantern"), lantern)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("S", "#", "S") .setShape("S", "#", "S")
.addMaterial('#', EndItems.CRYSTAL_SHARDS) .addMaterial('#', EndItems.CRYSTAL_SHARDS)
.addMaterial('S', slab, brickSlab) .addMaterial('S', slab, brickSlab)
.setGroup("end_stone_lanterns") .setGroup("end_stone_lanterns")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_furnace", furnace) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_furnace"), furnace)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "# #", "###") .setShape("###", "# #", "###")
.addMaterial('#', stone) .addMaterial('#', stone)
.setGroup("end_stone_ITEM_FURNACES") .setGroup("end_stone_ITEM_FURNACES")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, name + "_flower_pot", flowerPot) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_flower_pot"), flowerPot)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(3) .setOutputCount(3)
.setShape("# #", " # ") .setShape("# #", " # ")

4
src/main/java/org/betterx/betterend/integration/Integrations.java
View file

@ -2,7 +2,7 @@ package org.betterx.betterend.integration;
import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.api.v2.ModIntegrationAPI;
import org.betterx.bclib.integration.ModIntegration; import org.betterx.bclib.integration.ModIntegration;
import org.betterx.bclib.recipes.GridRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.events.PlayerAdvancementsCallback; import org.betterx.betterend.events.PlayerAdvancementsCallback;
@ -34,7 +34,7 @@ public class Integrations {
} }
}); });
GridRecipe.make(BetterEnd.MOD_ID, "guide_book", GuideBookItem.GUIDE_BOOK) BCLRecipeBuilder.crafting(BetterEnd.makeID("guide_book"), GuideBookItem.GUIDE_BOOK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("D", "B", "C") .setShape("D", "B", "C")
.addMaterial('D', EndItems.ENDER_DUST) .addMaterial('D', EndItems.ENDER_DUST)

45
src/main/java/org/betterx/betterend/recipe/AlloyingRecipes.java
View file

@ -1,6 +1,7 @@
package org.betterx.betterend.recipe; package org.betterx.betterend.recipe;
import org.betterx.betterend.recipe.builders.AlloyingRecipeBuilder; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems; import org.betterx.betterend.registry.EndItems;
import org.betterx.betterend.registry.EndTags; import org.betterx.betterend.registry.EndTags;
@ -10,43 +11,43 @@ import net.minecraft.world.level.block.Blocks;
public class AlloyingRecipes { public class AlloyingRecipes {
public static void register() { public static void register() {
AlloyingRecipeBuilder.create("additional_iron") BCLRecipeBuilder.alloying(BetterEnd.makeID("additional_iron"), Items.IRON_INGOT)
.setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON) .setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON)
.setOutput(Items.IRON_INGOT, 3) .setOutputCount(3)
.setExpiriense(2.1F) .setExperience(2.1F)
.build(); .build();
AlloyingRecipeBuilder.create("additional_gold") BCLRecipeBuilder.alloying(BetterEnd.makeID("additional_gold"), Items.GOLD_INGOT)
.setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD) .setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD)
.setOutput(Items.GOLD_INGOT, 3) .setOutputCount(3)
.setExpiriense(3F) .setExperience(3F)
.build(); .build();
AlloyingRecipeBuilder.create("additional_copper") BCLRecipeBuilder.alloying(BetterEnd.makeID("additional_copper"), Items.COPPER_INGOT)
.setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER) .setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER)
.setOutput(Items.COPPER_INGOT, 3) .setOutputCount(3)
.setExpiriense(3F) .setExperience(3F)
.build(); .build();
AlloyingRecipeBuilder.create("additional_netherite") BCLRecipeBuilder.alloying(BetterEnd.makeID("additional_netherite"), Items.NETHERITE_SCRAP)
.setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS) .setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS)
.setOutput(Items.NETHERITE_SCRAP, 3) .setOutputCount(3)
.setExpiriense(6F) .setExperience(6F)
.setSmeltTime(1000) .setSmeltTime(1000)
.build(); .build();
AlloyingRecipeBuilder.create("terminite_ingot") BCLRecipeBuilder.alloying(BetterEnd.makeID("terminite_ingot"), EndBlocks.TERMINITE.ingot)
.setInput(Items.IRON_INGOT, EndItems.ENDER_DUST) .setInput(Items.IRON_INGOT, EndItems.ENDER_DUST)
.setOutput(EndBlocks.TERMINITE.ingot, 1) .setOutputCount(1)
.setExpiriense(2.5F) .setExperience(2.5F)
.setSmeltTime(450) .setSmeltTime(450)
.build(); .build();
AlloyingRecipeBuilder.create("aeternium_ingot") BCLRecipeBuilder.alloying(BetterEnd.makeID("aeternium_ingot"), EndItems.AETERNIUM_INGOT)
.setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT) .setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT)
.setOutput(EndItems.AETERNIUM_INGOT, 1) .setOutputCount(1)
.setExpiriense(4.5F) .setExperience(4.5F)
.setSmeltTime(850) .setSmeltTime(850)
.build(); .build();
AlloyingRecipeBuilder.create("terminite_ingot_thallasium") BCLRecipeBuilder.alloying(BetterEnd.makeID("terminite_ingot_thallasium"), EndBlocks.TERMINITE.ingot)
.setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST) .setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST)
.setOutput(EndBlocks.TERMINITE.ingot, 1) .setOutputCount(1)
.setExpiriense(2.5F) .setExperience(2.5F)
.setSmeltTime(450) .setSmeltTime(450)
.build(); .build();
} }

31
src/main/java/org/betterx/betterend/recipe/AnvilRecipes.java
View file

@ -1,6 +1,7 @@
package org.betterx.betterend.recipe; package org.betterx.betterend.recipe;
import org.betterx.bclib.recipes.AnvilRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.item.material.EndToolMaterial; import org.betterx.betterend.item.material.EndToolMaterial;
import org.betterx.betterend.registry.EndItems; import org.betterx.betterend.registry.EndItems;
@ -10,76 +11,68 @@ import net.minecraft.world.item.Tiers;
public class AnvilRecipes { public class AnvilRecipes {
public static void register() { public static void register() {
AnvilRecipe.create("ender_pearl_to_dust") BCLRecipeBuilder.anvil(BetterEnd.makeID("ender_pearl_to_dust"), EndItems.ENDER_DUST)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(Items.ENDER_PEARL) .setInput(Items.ENDER_PEARL)
.setOutput(EndItems.ENDER_DUST)
.setAnvilLevel(Tiers.IRON.getLevel()) .setAnvilLevel(Tiers.IRON.getLevel())
.setToolLevel(4) .setToolLevel(4)
.setDamage(5) .setDamage(5)
.build(); .build();
AnvilRecipe.create("ender_shard_to_dust") BCLRecipeBuilder.anvil(BetterEnd.makeID("ender_shard_to_dust"), EndItems.ENDER_DUST)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.ENDER_SHARD) .setInput(EndItems.ENDER_SHARD)
.setOutput(EndItems.ENDER_DUST)
.setAnvilLevel(Tiers.IRON.getLevel()) .setAnvilLevel(Tiers.IRON.getLevel())
.setToolLevel(0) .setToolLevel(0)
.setDamage(3) .setDamage(3)
.build(); .build();
int anvilLevel = EndToolMaterial.AETERNIUM.getLevel(); int anvilLevel = EndToolMaterial.AETERNIUM.getLevel();
AnvilRecipe.create("aeternium_axe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_axe_head"), EndItems.AETERNIUM_AXE_HEAD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_AXE_HEAD)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_pickaxe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_pickaxe_head"), EndItems.AETERNIUM_PICKAXE_HEAD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_PICKAXE_HEAD)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_shovel_head") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_shovel_head"), EndItems.AETERNIUM_SHOVEL_HEAD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_SHOVEL_HEAD)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_hoe_head") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_hoe_head"), EndItems.AETERNIUM_HOE_HEAD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_HOE_HEAD)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_hammer_head") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_hammer_head"), EndItems.AETERNIUM_HAMMER_HEAD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_HAMMER_HEAD)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(EndToolMaterial.THALLASIUM.getLevel()) .setToolLevel(EndToolMaterial.THALLASIUM.getLevel())
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_sword_blade") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_sword_blade"), EndItems.AETERNIUM_SWORD_BLADE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_SWORD_BLADE)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)
.build(); .build();
AnvilRecipe.create("aeternium_forged_plate") BCLRecipeBuilder.anvil(BetterEnd.makeID("aeternium_forged_plate"), EndItems.AETERNIUM_FORGED_PLATE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.AETERNIUM_INGOT) .setInput(EndItems.AETERNIUM_INGOT)
.setOutput(EndItems.AETERNIUM_FORGED_PLATE)
.setAnvilLevel(anvilLevel) .setAnvilLevel(anvilLevel)
.setToolLevel(anvilLevel) .setToolLevel(anvilLevel)
.setDamage(6) .setDamage(6)

143
src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java
View file

@ -1,6 +1,6 @@
package org.betterx.betterend.recipe; package org.betterx.betterend.recipe;
import org.betterx.bclib.recipes.GridRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
@ -18,19 +18,19 @@ import net.minecraft.world.level.block.Blocks;
public class CraftingRecipes { public class CraftingRecipes {
public static void register() { public static void register() {
GridRecipe.make(BetterEnd.MOD_ID, "ender_perl_to_block", EndBlocks.ENDER_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_perl_to_block"), EndBlocks.ENDER_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("OO", "OO") .setShape("OO", "OO")
.addMaterial('O', Items.ENDER_PEARL) .addMaterial('O', Items.ENDER_PEARL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "ender_block_to_perl", Items.ENDER_PEARL) BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_block_to_perl"), Items.ENDER_PEARL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.addMaterial('#', EndBlocks.ENDER_BLOCK) .addMaterial('#', EndBlocks.ENDER_BLOCK)
.setOutputCount(4) .setOutputCount(4)
.setList("#") .setList("#")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "end_stone_smelter", EndBlocks.END_STONE_SMELTER) BCLRecipeBuilder.crafting(BetterEnd.makeID("end_stone_smelter"), EndBlocks.END_STONE_SMELTER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("T#T", "V V", "T#T") .setShape("T#T", "V V", "T#T")
.addMaterial('#', Blocks.END_STONE_BRICKS) .addMaterial('#', Blocks.END_STONE_BRICKS)
@ -59,7 +59,7 @@ public class CraftingRecipes {
registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR); registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR);
registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR); registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR);
GridRecipe.make(BetterEnd.MOD_ID, "infusion_pedestal", EndBlocks.INFUSION_PEDESTAL) BCLRecipeBuilder.crafting(BetterEnd.makeID("infusion_pedestal"), EndBlocks.INFUSION_PEDESTAL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape(" Y ", "O#O", " # ") .setShape(" Y ", "O#O", " # ")
.addMaterial('O', Items.ENDER_PEARL) .addMaterial('O', Items.ENDER_PEARL)
@ -68,75 +68,75 @@ public class CraftingRecipes {
.build(); .build();
String material = "aeternium"; String material = "aeternium";
GridRecipe.make(BetterEnd.MOD_ID, material + "_block", EndBlocks.AETERNIUM_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID(material + "_block"), EndBlocks.AETERNIUM_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("III", "III", "III") .setShape("III", "III", "III")
.addMaterial('I', EndItems.AETERNIUM_INGOT) .addMaterial('I', EndItems.AETERNIUM_INGOT)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, material + "_block_to_ingot", EndItems.AETERNIUM_INGOT) BCLRecipeBuilder.crafting(BetterEnd.makeID(material + "_block_to_ingot"), EndItems.AETERNIUM_INGOT)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.addMaterial('#', EndBlocks.AETERNIUM_BLOCK) .addMaterial('#', EndBlocks.AETERNIUM_BLOCK)
.setOutputCount(9) .setOutputCount(9)
.setList("#") .setList("#")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "blue_vine_seed_dye", Items.BLUE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("blue_vine_seed_dye"), Items.BLUE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.BLUE_VINE_SEED) .addMaterial('#', EndBlocks.BLUE_VINE_SEED)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "creeping_moss_dye", Items.CYAN_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("creeping_moss_dye"), Items.CYAN_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CREEPING_MOSS) .addMaterial('#', EndBlocks.CREEPING_MOSS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "umbrella_moss_dye", Items.YELLOW_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("umbrella_moss_dye"), Items.YELLOW_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.UMBRELLA_MOSS) .addMaterial('#', EndBlocks.UMBRELLA_MOSS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "umbrella_moss_tall_dye", Items.YELLOW_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("umbrella_moss_tall_dye"), Items.YELLOW_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(2) .setOutputCount(2)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.UMBRELLA_MOSS_TALL) .addMaterial('#', EndBlocks.UMBRELLA_MOSS_TALL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "shadow_plant_dye", Items.BLACK_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_plant_dye"), Items.BLACK_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.SHADOW_PLANT) .addMaterial('#', EndBlocks.SHADOW_PLANT)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "paper", Items.PAPER) BCLRecipeBuilder.crafting(BetterEnd.makeID("paper"), Items.PAPER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###") .setShape("###")
.addMaterial('#', EndItems.END_LILY_LEAF_DRIED) .addMaterial('#', EndItems.END_LILY_LEAF_DRIED)
.setOutputCount(3) .setOutputCount(3)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "aurora_block", EndBlocks.AURORA_CRYSTAL) BCLRecipeBuilder.crafting(BetterEnd.makeID("aurora_block"), EndBlocks.AURORA_CRYSTAL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndItems.CRYSTAL_SHARDS) .addMaterial('#', EndItems.CRYSTAL_SHARDS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "lotus_block", EndBlocks.END_LOTUS.getLog()) BCLRecipeBuilder.crafting(BetterEnd.makeID("lotus_block"), EndBlocks.END_LOTUS.getLog())
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndBlocks.END_LOTUS_STEM) .addMaterial('#', EndBlocks.END_LOTUS_STEM)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "needlegrass_stick", Items.STICK) BCLRecipeBuilder.crafting(BetterEnd.makeID("needlegrass_stick"), Items.STICK)
.setList("#") .setList("#")
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(2) .setOutputCount(2)
.addMaterial('#', EndBlocks.NEEDLEGRASS) .addMaterial('#', EndBlocks.NEEDLEGRASS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "shadow_berry_seeds", EndBlocks.SHADOW_BERRY) BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_seeds"), EndBlocks.SHADOW_BERRY)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.setOutputCount(4) .setOutputCount(4)
.addMaterial('#', EndItems.SHADOW_BERRY_RAW) .addMaterial('#', EndItems.SHADOW_BERRY_RAW)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "purple_polypore_dye", Items.PURPLE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("purple_polypore_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.PURPLE_POLYPORE) .addMaterial('#', EndBlocks.PURPLE_POLYPORE)
@ -150,56 +150,56 @@ public class CraftingRecipes {
registerLantern("purpur_lantern", EndBlocks.PURPUR_LANTERN, Blocks.PURPUR_SLAB); registerLantern("purpur_lantern", EndBlocks.PURPUR_LANTERN, Blocks.PURPUR_SLAB);
registerLantern("blackstone_lantern", EndBlocks.BLACKSTONE_LANTERN, Blocks.BLACKSTONE_SLAB); registerLantern("blackstone_lantern", EndBlocks.BLACKSTONE_LANTERN, Blocks.BLACKSTONE_SLAB);
GridRecipe.make(BetterEnd.MOD_ID, "amber_gem", EndItems.AMBER_GEM) BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_gem"), EndItems.AMBER_GEM)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndItems.RAW_AMBER) .addMaterial('#', EndItems.RAW_AMBER)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "amber_block", EndBlocks.AMBER_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_block"), EndBlocks.AMBER_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndItems.AMBER_GEM) .addMaterial('#', EndItems.AMBER_GEM)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "amber_gem_block", EndItems.AMBER_GEM) BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_gem_block"), EndItems.AMBER_GEM)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.AMBER_BLOCK) .addMaterial('#', EndBlocks.AMBER_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "iron_bulb_lantern", EndBlocks.IRON_BULB_LANTERN) BCLRecipeBuilder.crafting(BetterEnd.makeID("iron_bulb_lantern"), EndBlocks.IRON_BULB_LANTERN)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("C", "I", "#") .setShape("C", "I", "#")
.addMaterial('C', Items.CHAIN) .addMaterial('C', Items.CHAIN)
.addMaterial('I', Items.IRON_INGOT) .addMaterial('I', Items.IRON_INGOT)
.addMaterial('#', EndItems.GLOWING_BULB) .addMaterial('#', EndItems.GLOWING_BULB)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "twisted_moss_dye", Items.PINK_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_moss_dye"), Items.PINK_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.TWISTED_MOSS) .addMaterial('#', EndBlocks.TWISTED_MOSS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "byshy_grass_dye", Items.MAGENTA_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("byshy_grass_dye"), Items.MAGENTA_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.BUSHY_GRASS) .addMaterial('#', EndBlocks.BUSHY_GRASS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "tail_moss_dye", Items.GRAY_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("tail_moss_dye"), Items.GRAY_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.TAIL_MOSS) .addMaterial('#', EndBlocks.TAIL_MOSS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "petal_block", EndBlocks.HYDRALUX_PETAL_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("petal_block"), EndBlocks.HYDRALUX_PETAL_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndItems.HYDRALUX_PETAL) .addMaterial('#', EndItems.HYDRALUX_PETAL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "petal_white_dye", Items.WHITE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("petal_white_dye"), Items.WHITE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndItems.HYDRALUX_PETAL) .addMaterial('#', EndItems.HYDRALUX_PETAL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "sweet_berry_jelly", EndItems.SWEET_BERRY_JELLY) BCLRecipeBuilder.crafting(BetterEnd.makeID("sweet_berry_jelly"), EndItems.SWEET_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB") .setList("JWSB")
.addMaterial('J', EndItems.GELATINE) .addMaterial('J', EndItems.GELATINE)
@ -208,7 +208,7 @@ public class CraftingRecipes {
.addMaterial('B', Items.SWEET_BERRIES) .addMaterial('B', Items.SWEET_BERRIES)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "shadow_berry_jelly", EndItems.SHADOW_BERRY_JELLY) BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_jelly"), EndItems.SHADOW_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB") .setList("JWSB")
.addMaterial('J', EndItems.GELATINE) .addMaterial('J', EndItems.GELATINE)
@ -217,7 +217,7 @@ public class CraftingRecipes {
.addMaterial('B', EndItems.SHADOW_BERRY_COOKED) .addMaterial('B', EndItems.SHADOW_BERRY_COOKED)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "shadow_berry_jelly", EndItems.BLOSSOM_BERRY_JELLY) BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_jelly"), EndItems.BLOSSOM_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB") .setList("JWSB")
.addMaterial('J', EndItems.GELATINE) .addMaterial('J', EndItems.GELATINE)
@ -226,7 +226,7 @@ public class CraftingRecipes {
.addMaterial('B', EndItems.BLOSSOM_BERRY) .addMaterial('B', EndItems.BLOSSOM_BERRY)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "sulphur_gunpowder", Items.GUNPOWDER) BCLRecipeBuilder.crafting(BetterEnd.makeID("sulphur_gunpowder"), Items.GUNPOWDER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("SCB") .setList("SCB")
.addMaterial('S', EndItems.CRYSTALLINE_SULPHUR) .addMaterial('S', EndItems.CRYSTALLINE_SULPHUR)
@ -234,49 +234,49 @@ public class CraftingRecipes {
.addMaterial('B', Items.BONE_MEAL) .addMaterial('B', Items.BONE_MEAL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "dense_emerald_ice", EndBlocks.DENSE_EMERALD_ICE) BCLRecipeBuilder.crafting(BetterEnd.makeID("dense_emerald_ice"), EndBlocks.DENSE_EMERALD_ICE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndBlocks.EMERALD_ICE) .addMaterial('#', EndBlocks.EMERALD_ICE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "ancient_emerald_ice", EndBlocks.ANCIENT_EMERALD_ICE) BCLRecipeBuilder.crafting(BetterEnd.makeID("ancient_emerald_ice"), EndBlocks.ANCIENT_EMERALD_ICE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###") .setShape("###", "###", "###")
.addMaterial('#', EndBlocks.DENSE_EMERALD_ICE) .addMaterial('#', EndBlocks.DENSE_EMERALD_ICE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_cyan_dye", Items.CYAN_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_cyan_dye"), Items.CYAN_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_CYAN) .addMaterial('#', EndBlocks.CHARNIA_CYAN)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_green_dye", Items.GREEN_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_green_dye"), Items.GREEN_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_GREEN) .addMaterial('#', EndBlocks.CHARNIA_GREEN)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_light_blue_dye", Items.LIGHT_BLUE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_light_blue_dye"), Items.LIGHT_BLUE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_LIGHT_BLUE) .addMaterial('#', EndBlocks.CHARNIA_LIGHT_BLUE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_orange_dye", Items.ORANGE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_orange_dye"), Items.ORANGE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_ORANGE) .addMaterial('#', EndBlocks.CHARNIA_ORANGE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_purple_dye", Items.PURPLE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_purple_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_PURPLE) .addMaterial('#', EndBlocks.CHARNIA_PURPLE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charnia_red_dye", Items.RED_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_red_dye"), Items.RED_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARNIA_RED) .addMaterial('#', EndBlocks.CHARNIA_RED)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "respawn_obelisk", EndBlocks.RESPAWN_OBELISK) BCLRecipeBuilder.crafting(BetterEnd.makeID("respawn_obelisk"), EndBlocks.RESPAWN_OBELISK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("CSC", "CSC", "AAA") .setShape("CSC", "CSC", "AAA")
.addMaterial('C', EndBlocks.AURORA_CRYSTAL) .addMaterial('C', EndBlocks.AURORA_CRYSTAL)
@ -284,44 +284,44 @@ public class CraftingRecipes {
.addMaterial('A', EndBlocks.AMBER_BLOCK) .addMaterial('A', EndBlocks.AMBER_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "twisted_umbrella_moss_dye", Items.PURPLE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_umbrella_moss_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS) .addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "twisted_umbrella_moss_dye_tall", Items.PURPLE_DYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_umbrella_moss_dye_tall"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(2) .setOutputCount(2)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS_TALL) .addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS_TALL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "leather_to_stripes", EndItems.LEATHER_STRIPE) BCLRecipeBuilder.crafting(BetterEnd.makeID("leather_to_stripes"), EndItems.LEATHER_STRIPE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("L") .setList("L")
.addMaterial('L', Items.LEATHER) .addMaterial('L', Items.LEATHER)
.setOutputCount(3) .setOutputCount(3)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "stripes_to_leather", Items.LEATHER) BCLRecipeBuilder.crafting(BetterEnd.makeID("stripes_to_leather"), Items.LEATHER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("SSS") .setList("SSS")
.addMaterial('S', EndItems.LEATHER_STRIPE) .addMaterial('S', EndItems.LEATHER_STRIPE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "leather_wrapped_stick", EndItems.LEATHER_WRAPPED_STICK) BCLRecipeBuilder.crafting(BetterEnd.makeID("leather_wrapped_stick"), EndItems.LEATHER_WRAPPED_STICK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("SL") .setList("SL")
.addMaterial('S', Items.STICK) .addMaterial('S', Items.STICK)
.addMaterial('L', EndItems.LEATHER_STRIPE) .addMaterial('L', EndItems.LEATHER_STRIPE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "fiber_string", Items.STRING) BCLRecipeBuilder.crafting(BetterEnd.makeID("fiber_string"), Items.STRING)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6) .setOutputCount(6)
.setShape("#", "#", "#") .setShape("#", "#", "#")
.addMaterial('#', EndItems.SILK_FIBER) .addMaterial('#', EndItems.SILK_FIBER)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "ender_eye_amber", Items.ENDER_EYE) BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_eye_amber"), Items.ENDER_EYE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("SAS", "APA", "SAS") .setShape("SAS", "APA", "SAS")
.addMaterial('S', EndItems.CRYSTAL_SHARDS) .addMaterial('S', EndItems.CRYSTAL_SHARDS)
@ -329,14 +329,14 @@ public class CraftingRecipes {
.addMaterial('P', Items.ENDER_PEARL) .addMaterial('P', Items.ENDER_PEARL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "iron_chandelier", EndBlocks.IRON_CHANDELIER) BCLRecipeBuilder.crafting(BetterEnd.makeID("iron_chandelier"), EndBlocks.IRON_CHANDELIER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("I#I", " # ") .setShape("I#I", " # ")
.addMaterial('#', Items.IRON_INGOT) .addMaterial('#', Items.IRON_INGOT)
.addMaterial('I', EndItems.LUMECORN_ROD) .addMaterial('I', EndItems.LUMECORN_ROD)
.setGroup("end_metal_chandelier") .setGroup("end_metal_chandelier")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "gold_chandelier", EndBlocks.GOLD_CHANDELIER) BCLRecipeBuilder.crafting(BetterEnd.makeID("gold_chandelier"), EndBlocks.GOLD_CHANDELIER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("I#I", " # ") .setShape("I#I", " # ")
.addMaterial('#', Items.GOLD_INGOT) .addMaterial('#', Items.GOLD_INGOT)
@ -344,11 +344,16 @@ public class CraftingRecipes {
.setGroup("end_metal_chandelier") .setGroup("end_metal_chandelier")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "missing_tile", EndBlocks.MISSING_TILE) BCLRecipeBuilder.crafting(BetterEnd.makeID("missing_tile"), EndBlocks.MISSING_TILE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setShape("#P", "P#") .setShape("#P", "P#")
.addMaterial('#', EndBlocks.VIOLECITE.stone, EndBlocks.VIOLECITE.bricks, EndBlocks.VIOLECITE.tiles) .addMaterial(
'#',
EndBlocks.VIOLECITE.stone,
EndBlocks.VIOLECITE.bricks,
EndBlocks.VIOLECITE.tiles
)
.addMaterial('P', Blocks.PURPUR_BLOCK) .addMaterial('P', Blocks.PURPUR_BLOCK)
.build(); .build();
@ -356,29 +361,29 @@ public class CraftingRecipes {
registerHammer("golden", Items.GOLD_INGOT, EndItems.GOLDEN_HAMMER); registerHammer("golden", Items.GOLD_INGOT, EndItems.GOLDEN_HAMMER);
registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER); registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER);
GridRecipe.make(BetterEnd.MOD_ID, "charcoal_block", EndBlocks.CHARCOAL_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("charcoal_block"), EndBlocks.CHARCOAL_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###") .setShape("###", "###", "###")
.addMaterial('#', Items.CHARCOAL) .addMaterial('#', Items.CHARCOAL)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "charcoal_from_block", Items.CHARCOAL) BCLRecipeBuilder.crafting(BetterEnd.makeID("charcoal_from_block"), Items.CHARCOAL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(9) .setOutputCount(9)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CHARCOAL_BLOCK) .addMaterial('#', EndBlocks.CHARCOAL_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "end_stone_furnace", EndBlocks.END_STONE_FURNACE) BCLRecipeBuilder.crafting(BetterEnd.makeID("end_stone_furnace"), EndBlocks.END_STONE_FURNACE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "# #", "###") .setShape("###", "# #", "###")
.addMaterial('#', Blocks.END_STONE) .addMaterial('#', Blocks.END_STONE)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "filalux_lantern", EndBlocks.FILALUX_LANTERN) BCLRecipeBuilder.crafting(BetterEnd.makeID("filalux_lantern"), EndBlocks.FILALUX_LANTERN)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###") .setShape("###", "###", "###")
.addMaterial('#', EndBlocks.FILALUX) .addMaterial('#', EndBlocks.FILALUX)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "silk_moth_hive", EndBlocks.SILK_MOTH_HIVE) BCLRecipeBuilder.crafting(BetterEnd.makeID("silk_moth_hive"), EndBlocks.SILK_MOTH_HIVE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("#L#", "LML", "#L#") .setShape("#L#", "LML", "#L#")
.addMaterial('#', EndBlocks.TENANEA.getBlock("planks")) .addMaterial('#', EndBlocks.TENANEA.getBlock("planks"))
@ -386,7 +391,7 @@ public class CraftingRecipes {
.addMaterial('M', EndItems.SILK_MOTH_MATRIX) .addMaterial('M', EndItems.SILK_MOTH_MATRIX)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "cave_pumpkin_pie", EndItems.CAVE_PUMPKIN_PIE) BCLRecipeBuilder.crafting(BetterEnd.makeID("cave_pumpkin_pie"), EndItems.CAVE_PUMPKIN_PIE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("SBS", "BPB", "SBS") .setShape("SBS", "BPB", "SBS")
.addMaterial('P', EndBlocks.CAVE_PUMPKIN) .addMaterial('P', EndBlocks.CAVE_PUMPKIN)
@ -394,37 +399,37 @@ public class CraftingRecipes {
.addMaterial('S', Items.SUGAR) .addMaterial('S', Items.SUGAR)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "cave_pumpkin_seeds", EndBlocks.CAVE_PUMPKIN_SEED) BCLRecipeBuilder.crafting(BetterEnd.makeID("cave_pumpkin_seeds"), EndBlocks.CAVE_PUMPKIN_SEED)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4) .setOutputCount(4)
.setList("#") .setList("#")
.addMaterial('#', EndBlocks.CAVE_PUMPKIN) .addMaterial('#', EndBlocks.CAVE_PUMPKIN)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "neon_cactus_block", EndBlocks.NEON_CACTUS_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block"), EndBlocks.NEON_CACTUS_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##") .setShape("##", "##")
.addMaterial('#', EndBlocks.NEON_CACTUS) .addMaterial('#', EndBlocks.NEON_CACTUS)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "neon_cactus_block_slab", EndBlocks.NEON_CACTUS_BLOCK_SLAB) BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block_slab"), EndBlocks.NEON_CACTUS_BLOCK_SLAB)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###") .setShape("###")
.setOutputCount(6) .setOutputCount(6)
.addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK) .addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "neon_cactus_block_stairs", EndBlocks.NEON_CACTUS_BLOCK_STAIRS) BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block_stairs"), EndBlocks.NEON_CACTUS_BLOCK_STAIRS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.setOutputCount(4) .setOutputCount(4)
.addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK) .addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "sugar_from_root", Items.SUGAR) BCLRecipeBuilder.crafting(BetterEnd.makeID("sugar_from_root"), Items.SUGAR)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setList("###") .setList("###")
.addMaterial('#', EndItems.AMBER_ROOT_RAW) .addMaterial('#', EndItems.AMBER_ROOT_RAW)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "endstone_flower_pot", EndBlocks.ENDSTONE_FLOWER_POT) BCLRecipeBuilder.crafting(BetterEnd.makeID("endstone_flower_pot"), EndBlocks.ENDSTONE_FLOWER_POT)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(3) .setOutputCount(3)
.setShape("# #", " # ") .setShape("# #", " # ")
@ -432,20 +437,20 @@ public class CraftingRecipes {
.setGroup("end_pots") .setGroup("end_pots")
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "dragon_bone_block", EndBlocks.DRAGON_BONE_BLOCK) BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_block"), EndBlocks.DRAGON_BONE_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(8) .setOutputCount(8)
.setShape("###", "#D#", "###") .setShape("###", "#D#", "###")
.addMaterial('#', Blocks.BONE_BLOCK) .addMaterial('#', Blocks.BONE_BLOCK)
.addMaterial('D', Items.DRAGON_BREATH) .addMaterial('D', Items.DRAGON_BREATH)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "dragon_bone_slab", EndBlocks.DRAGON_BONE_SLAB) BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_slab"), EndBlocks.DRAGON_BONE_SLAB)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("###") .setShape("###")
.setOutputCount(6) .setOutputCount(6)
.addMaterial('#', EndBlocks.DRAGON_BONE_BLOCK) .addMaterial('#', EndBlocks.DRAGON_BONE_BLOCK)
.build(); .build();
GridRecipe.make(BetterEnd.MOD_ID, "dragon_bone_stairs", EndBlocks.DRAGON_BONE_STAIRS) BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_stairs"), EndBlocks.DRAGON_BONE_STAIRS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("# ", "## ", "###") .setShape("# ", "## ", "###")
.setOutputCount(4) .setOutputCount(4)
@ -454,7 +459,7 @@ public class CraftingRecipes {
} }
private static void registerLantern(String name, Block lantern, Block slab) { private static void registerLantern(String name, Block lantern, Block slab) {
GridRecipe.make(BetterEnd.MOD_ID, name, lantern) BCLRecipeBuilder.crafting(BetterEnd.makeID(name), lantern)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("S", "#", "S") .setShape("S", "#", "S")
.addMaterial('#', EndItems.CRYSTAL_SHARDS) .addMaterial('#', EndItems.CRYSTAL_SHARDS)
@ -464,7 +469,7 @@ public class CraftingRecipes {
} }
public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) {
GridRecipe.make(BetterEnd.MOD_ID, name, pedestal) BCLRecipeBuilder.crafting(BetterEnd.makeID(name), pedestal)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("S", "#", "S") .setShape("S", "#", "S")
.addMaterial('S', slab) .addMaterial('S', slab)
@ -474,7 +479,7 @@ public class CraftingRecipes {
} }
private static void registerHammer(String name, Item material, Item result) { private static void registerHammer(String name, Item material, Item result) {
GridRecipe.make(BetterEnd.MOD_ID, name + "_hammer", result) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_hammer"), result)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setShape("I I", "I#I", " # ") .setShape("I I", "I#I", " # ")
.addMaterial('I', material) .addMaterial('I', material)

47
src/main/java/org/betterx/betterend/recipe/FurnaceRecipes.java
View file

@ -1,6 +1,6 @@
package org.betterx.betterend.recipe; package org.betterx.betterend.recipe;
import org.betterx.bclib.recipes.FurnaceRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
@ -11,35 +11,44 @@ import net.minecraft.world.level.block.Blocks;
public class FurnaceRecipes { public class FurnaceRecipes {
public static void register() { public static void register() {
FurnaceRecipe.make( BCLRecipeBuilder.smelting(BetterEnd.makeID("end_lily_leaf_dried"), EndItems.END_LILY_LEAF_DRIED)
BetterEnd.MOD_ID,
"end_lily_leaf_dried",
EndItems.END_LILY_LEAF,
EndItems.END_LILY_LEAF_DRIED
).checkConfig(Configs.RECIPE_CONFIG).build();
FurnaceRecipe.make(BetterEnd.MOD_ID, "end_glass", EndBlocks.ENDSTONE_DUST, Blocks.GLASS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.END_LILY_LEAF)
.build(); .build();
FurnaceRecipe.make(BetterEnd.MOD_ID, "end_berry", EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED)
BCLRecipeBuilder.smelting(BetterEnd.makeID("end_glass"), Blocks.GLASS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndBlocks.ENDSTONE_DUST)
.build();
BCLRecipeBuilder.smelting(BetterEnd.makeID("end_berry"), EndItems.SHADOW_BERRY_COOKED)
.checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.SHADOW_BERRY_RAW)
.buildFoodlike(); .buildFoodlike();
FurnaceRecipe.make(BetterEnd.MOD_ID, "end_fish", EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED)
BCLRecipeBuilder.smelting(BetterEnd.makeID("end_fish"), EndItems.END_FISH_COOKED)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.END_FISH_RAW)
.buildFoodlike(); .buildFoodlike();
FurnaceRecipe.make(BetterEnd.MOD_ID, "slime_ball", EndBlocks.JELLYSHROOM_CAP_PURPLE, Items.SLIME_BALL)
BCLRecipeBuilder.smelting(BetterEnd.makeID("slime_ball"), Items.SLIME_BALL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndBlocks.JELLYSHROOM_CAP_PURPLE)
.build(); .build();
FurnaceRecipe.make(BetterEnd.MOD_ID, "menger_sponge", EndBlocks.MENGER_SPONGE_WET, EndBlocks.MENGER_SPONGE)
BCLRecipeBuilder.smelting(BetterEnd.makeID("menger_sponge"), EndBlocks.MENGER_SPONGE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndBlocks.MENGER_SPONGE_WET)
.build(); .build();
FurnaceRecipe.make(
BetterEnd.MOD_ID, BCLRecipeBuilder.smelting(BetterEnd.makeID("chorus_mushroom"), EndItems.CHORUS_MUSHROOM_COOKED)
"chorus_mushroom",
EndItems.CHORUS_MUSHROOM_RAW,
EndItems.CHORUS_MUSHROOM_COOKED
).checkConfig(Configs.RECIPE_CONFIG).buildFoodlike();
FurnaceRecipe.make(BetterEnd.MOD_ID, "bolux_mushroom", EndBlocks.BOLUX_MUSHROOM, EndItems.BOLUX_MUSHROOM_COOKED)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndItems.CHORUS_MUSHROOM_RAW)
.buildFoodlike();
BCLRecipeBuilder.smelting(BetterEnd.makeID("bolux_mushroom"), EndItems.BOLUX_MUSHROOM_COOKED)
.checkConfig(Configs.RECIPE_CONFIG)
.setInput(EndBlocks.BOLUX_MUSHROOM)
.buildFoodlike(); .buildFoodlike();
} }
} }

47
src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java
View file

@ -1,6 +1,6 @@
package org.betterx.betterend.recipe; package org.betterx.betterend.recipe;
import org.betterx.bclib.recipes.SmithingTableRecipe; import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
@ -11,98 +11,83 @@ import net.minecraft.world.item.Items;
public class SmithingRecipes { public class SmithingRecipes {
public static void register() { public static void register() {
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_sword_handle") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword_handle"), EndItems.AETERNIUM_SWORD_HANDLE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_SWORD_HANDLE)
.setBase(EndBlocks.TERMINITE.ingot) .setBase(EndBlocks.TERMINITE.ingot)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_sword") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword"), EndItems.AETERNIUM_SWORD)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_SWORD)
.setBase(EndItems.AETERNIUM_SWORD_BLADE) .setBase(EndItems.AETERNIUM_SWORD_BLADE)
.setAddition(EndItems.AETERNIUM_SWORD_HANDLE) .setAddition(EndItems.AETERNIUM_SWORD_HANDLE)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_pickaxe") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_pickaxe"), EndItems.AETERNIUM_PICKAXE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_PICKAXE)
.setBase(EndItems.AETERNIUM_PICKAXE_HEAD) .setBase(EndItems.AETERNIUM_PICKAXE_HEAD)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_axe") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_axe"), EndItems.AETERNIUM_AXE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_AXE)
.setBase(EndItems.AETERNIUM_AXE_HEAD) .setBase(EndItems.AETERNIUM_AXE_HEAD)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_shovel") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_shovel"), EndItems.AETERNIUM_SHOVEL)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_SHOVEL)
.setBase(EndItems.AETERNIUM_SHOVEL_HEAD) .setBase(EndItems.AETERNIUM_SHOVEL_HEAD)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_hoe") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_hoe"), EndItems.AETERNIUM_HOE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_HOE)
.setBase(EndItems.AETERNIUM_HOE_HEAD) .setBase(EndItems.AETERNIUM_HOE_HEAD)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_hammer") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_hammer"), EndItems.AETERNIUM_HAMMER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_HAMMER)
.setBase(EndItems.AETERNIUM_HAMMER_HEAD) .setBase(EndItems.AETERNIUM_HAMMER_HEAD)
.setAddition(EndItems.LEATHER_WRAPPED_STICK) .setAddition(EndItems.LEATHER_WRAPPED_STICK)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "netherite_hammer") BCLRecipeBuilder.smithing(BetterEnd.makeID("netherite_hammer"), EndItems.NETHERITE_HAMMER)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.NETHERITE_HAMMER)
.setBase(EndItems.DIAMOND_HAMMER) .setBase(EndItems.DIAMOND_HAMMER)
.setAddition(Items.NETHERITE_INGOT) .setAddition(Items.NETHERITE_INGOT)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_helmet") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_helmet"), EndItems.AETERNIUM_HELMET)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_HELMET)
.setBase(EndBlocks.TERMINITE.helmet) .setBase(EndBlocks.TERMINITE.helmet)
.setAddition(EndItems.AETERNIUM_FORGED_PLATE) .setAddition(EndItems.AETERNIUM_FORGED_PLATE)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_chestplate") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_chestplate"), EndItems.AETERNIUM_CHESTPLATE)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_CHESTPLATE)
.setBase(EndBlocks.TERMINITE.chestplate) .setBase(EndBlocks.TERMINITE.chestplate)
.setAddition(EndItems.AETERNIUM_FORGED_PLATE) .setAddition(EndItems.AETERNIUM_FORGED_PLATE)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_leggings") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_leggings"), EndItems.AETERNIUM_LEGGINGS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_LEGGINGS)
.setBase(EndBlocks.TERMINITE.leggings) .setBase(EndBlocks.TERMINITE.leggings)
.setAddition(EndItems.AETERNIUM_FORGED_PLATE) .setAddition(EndItems.AETERNIUM_FORGED_PLATE)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_boots") BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_boots"), EndItems.AETERNIUM_BOOTS)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.AETERNIUM_BOOTS)
.setBase(EndBlocks.TERMINITE.boots) .setBase(EndBlocks.TERMINITE.boots)
.setAddition(EndItems.AETERNIUM_FORGED_PLATE) .setAddition(EndItems.AETERNIUM_FORGED_PLATE)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "thallasium_anvil_updrade") BCLRecipeBuilder.smithing(BetterEnd.makeID("thallasium_anvil_updrade"), EndBlocks.TERMINITE.anvilBlock.asItem())
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndBlocks.TERMINITE.anvilBlock.asItem())
.setBase(EndBlocks.THALLASIUM.anvilBlock.asItem()) .setBase(EndBlocks.THALLASIUM.anvilBlock.asItem())
.setAddition(EndBlocks.TERMINITE.block) .setAddition(EndBlocks.TERMINITE.block)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "terminite_anvil_updrade") BCLRecipeBuilder.smithing(BetterEnd.makeID("terminite_anvil_updrade"), EndBlocks.AETERNIUM_ANVIL.asItem())
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndBlocks.AETERNIUM_ANVIL.asItem())
.setBase(EndBlocks.TERMINITE.anvilBlock.asItem()) .setBase(EndBlocks.TERMINITE.anvilBlock.asItem())
.setAddition(EndItems.AETERNIUM_INGOT) .setAddition(EndItems.AETERNIUM_INGOT)
.build(); .build();
SmithingTableRecipe.create(BetterEnd.MOD_ID, "armored_elytra") BCLRecipeBuilder.smithing(BetterEnd.makeID("armored_elytra"), EndItems.ARMORED_ELYTRA)
.checkConfig(Configs.RECIPE_CONFIG) .checkConfig(Configs.RECIPE_CONFIG)
.setResult(EndItems.ARMORED_ELYTRA)
.setBase(Items.ELYTRA) .setBase(Items.ELYTRA)
.setAddition(EndItems.AETERNIUM_INGOT) .setAddition(EndItems.AETERNIUM_INGOT)
.build(); .build();

14
src/main/java/org/betterx/betterend/recipe/builders/AlloyingRecipeBuilder.java
View file

@ -1,14 +0,0 @@
package org.betterx.betterend.recipe.builders;
import org.betterx.bclib.recipes.AlloyingRecipe;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
public class AlloyingRecipeBuilder extends AlloyingRecipe.Builder {
private AlloyingRecipeBuilder() {
}
public static AlloyingRecipe.Builder create(String id) {
return AlloyingRecipe.Builder.create(BetterEnd.MOD_ID, id, Configs.RECIPE_CONFIG);
}
}