Fixed most compiletime errors

This commit is contained in:
Frank 2023-04-29 11:48:56 +02:00
parent e232184b68
commit a974fab707
58 changed files with 449 additions and 679 deletions

View file

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

View file

@ -2,7 +2,6 @@ package org.betterx.betterend.recipe;
import org.betterx.bclib.recipes.BCLRecipeBuilder;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import org.betterx.worlds.together.tag.v3.CommonItemTags;
@ -19,19 +18,16 @@ public class CraftingRecipes {
public static void register() {
BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_perl_to_block"), EndBlocks.ENDER_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("OO", "OO")
.addMaterial('O', Items.ENDER_PEARL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_block_to_perl"), Items.ENDER_PEARL)
.checkConfig(Configs.RECIPE_CONFIG)
.addMaterial('#', EndBlocks.ENDER_BLOCK)
.setOutputCount(4)
.setList("#")
.shapeless()
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("end_stone_smelter"), EndBlocks.END_STONE_SMELTER)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("T#T", "V V", "T#T")
.addMaterial('#', Blocks.END_STONE_BRICKS)
.addMaterial('T', EndBlocks.THALLASIUM.ingot)
@ -60,7 +56,6 @@ public class CraftingRecipes {
registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR);
BCLRecipeBuilder.crafting(BetterEnd.makeID("infusion_pedestal"), EndBlocks.INFUSION_PEDESTAL)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape(" Y ", "O#O", " # ")
.addMaterial('O', Items.ENDER_PEARL)
.addMaterial('Y', Items.ENDER_EYE)
@ -69,76 +64,63 @@ public class CraftingRecipes {
String material = "aeternium";
BCLRecipeBuilder.crafting(BetterEnd.makeID(material + "_block"), EndBlocks.AETERNIUM_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("III", "III", "III")
.addMaterial('I', EndItems.AETERNIUM_INGOT)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID(material + "_block_to_ingot"), EndItems.AETERNIUM_INGOT)
.checkConfig(Configs.RECIPE_CONFIG)
.addMaterial('#', EndBlocks.AETERNIUM_BLOCK)
.setOutputCount(9)
.setList("#")
.shapeless()
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("blue_vine_seed_dye"), Items.BLUE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.BLUE_VINE_SEED)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("creeping_moss_dye"), Items.CYAN_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CREEPING_MOSS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("umbrella_moss_dye"), Items.YELLOW_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.UMBRELLA_MOSS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("umbrella_moss_tall_dye"), Items.YELLOW_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(2)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.UMBRELLA_MOSS_TALL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_plant_dye"), Items.BLACK_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.SHADOW_PLANT)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("paper"), Items.PAPER)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###")
.addMaterial('#', EndItems.END_LILY_LEAF_DRIED)
.setOutputCount(3)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("aurora_block"), EndBlocks.AURORA_CRYSTAL)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndItems.CRYSTAL_SHARDS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("lotus_block"), EndBlocks.END_LOTUS.getLog())
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndBlocks.END_LOTUS_STEM)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("needlegrass_stick"), Items.STICK)
.setList("#")
.checkConfig(Configs.RECIPE_CONFIG)
.shapeless()
.setOutputCount(2)
.addMaterial('#', EndBlocks.NEEDLEGRASS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_seeds"), EndBlocks.SHADOW_BERRY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.setOutputCount(4)
.addMaterial('#', EndItems.SHADOW_BERRY_RAW)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("purple_polypore_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.PURPLE_POLYPORE)
.build();
@ -151,57 +133,47 @@ public class CraftingRecipes {
registerLantern("blackstone_lantern", EndBlocks.BLACKSTONE_LANTERN, Blocks.BLACKSTONE_SLAB);
BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_gem"), EndItems.AMBER_GEM)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndItems.RAW_AMBER)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_block"), EndBlocks.AMBER_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndItems.AMBER_GEM)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("amber_gem_block"), EndItems.AMBER_GEM)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.AMBER_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("iron_bulb_lantern"), EndBlocks.IRON_BULB_LANTERN)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("C", "I", "#")
.addMaterial('C', Items.CHAIN)
.addMaterial('I', Items.IRON_INGOT)
.addMaterial('#', EndItems.GLOWING_BULB)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_moss_dye"), Items.PINK_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.TWISTED_MOSS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("byshy_grass_dye"), Items.MAGENTA_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.BUSHY_GRASS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("tail_moss_dye"), Items.GRAY_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.TAIL_MOSS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("petal_block"), EndBlocks.HYDRALUX_PETAL_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndItems.HYDRALUX_PETAL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("petal_white_dye"), Items.WHITE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndItems.HYDRALUX_PETAL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("sweet_berry_jelly_potion"), EndItems.SWEET_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER))
.addMaterial('S', Items.SUGAR)
@ -210,8 +182,7 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_jelly_potion"), EndItems.SHADOW_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER))
.addMaterial('S', Items.SUGAR)
@ -220,8 +191,7 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("blossom_berry_jelly_potion"), EndItems.BLOSSOM_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER))
.addMaterial('S', Items.SUGAR)
@ -230,8 +200,7 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("sweet_berry_jelly"), EndItems.SWEET_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', CommonItemTags.WATER_BOTTLES)
.addMaterial('S', Items.SUGAR)
@ -240,8 +209,7 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("shadow_berry_jelly"), EndItems.SHADOW_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', CommonItemTags.WATER_BOTTLES)
.addMaterial('S', Items.SUGAR)
@ -250,8 +218,7 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("blossom_berry_jelly"), EndItems.BLOSSOM_BERRY_JELLY)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("JWSB")
.shapeless()
.addMaterial('J', EndItems.GELATINE)
.addMaterial('W', CommonItemTags.WATER_BOTTLES)
.addMaterial('S', Items.SUGAR)
@ -260,57 +227,47 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("sulphur_gunpowder"), Items.GUNPOWDER)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("SCB")
.shapeless()
.addMaterial('S', EndItems.CRYSTALLINE_SULPHUR)
.addMaterial('C', Items.COAL, Items.CHARCOAL)
.addMaterial('B', Items.BONE_MEAL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("dense_emerald_ice"), EndBlocks.DENSE_EMERALD_ICE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndBlocks.EMERALD_ICE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("ancient_emerald_ice"), EndBlocks.ANCIENT_EMERALD_ICE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###")
.addMaterial('#', EndBlocks.DENSE_EMERALD_ICE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_cyan_dye"), Items.CYAN_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_CYAN)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_green_dye"), Items.GREEN_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_GREEN)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_light_blue_dye"), Items.LIGHT_BLUE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_LIGHT_BLUE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_orange_dye"), Items.ORANGE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_ORANGE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_purple_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_PURPLE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charnia_red_dye"), Items.RED_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARNIA_RED)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("respawn_obelisk"), EndBlocks.RESPAWN_OBELISK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("CSC", "CSC", "AAA")
.addMaterial('C', EndBlocks.AURORA_CRYSTAL)
.addMaterial('S', EndItems.ETERNAL_CRYSTAL)
@ -318,44 +275,37 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_umbrella_moss_dye"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("twisted_umbrella_moss_dye_tall"), Items.PURPLE_DYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(2)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.TWISTED_UMBRELLA_MOSS_TALL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("leather_to_stripes"), EndItems.LEATHER_STRIPE)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("L")
.shapeless()
.addMaterial('L', Items.LEATHER)
.setOutputCount(3)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("stripes_to_leather"), Items.LEATHER)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("SSS")
.setShape("SSS")
.addMaterial('S', EndItems.LEATHER_STRIPE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("leather_wrapped_stick"), EndItems.LEATHER_WRAPPED_STICK)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("SL")
.shapeless()
.addMaterial('S', Items.STICK)
.addMaterial('L', EndItems.LEATHER_STRIPE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("fiber_string"), Items.STRING)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(6)
.setShape("#", "#", "#")
.addMaterial('#', EndItems.SILK_FIBER)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("ender_eye_amber"), Items.ENDER_EYE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("SAS", "APA", "SAS")
.addMaterial('S', EndItems.CRYSTAL_SHARDS)
.addMaterial('A', EndItems.AMBER_GEM)
@ -363,14 +313,12 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("iron_chandelier"), EndBlocks.IRON_CHANDELIER)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("I#I", " # ")
.addMaterial('#', Items.IRON_INGOT)
.addMaterial('I', EndItems.LUMECORN_ROD)
.setGroup("end_metal_chandelier")
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("gold_chandelier"), EndBlocks.GOLD_CHANDELIER)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("I#I", " # ")
.addMaterial('#', Items.GOLD_INGOT)
.addMaterial('I', EndItems.LUMECORN_ROD)
@ -378,7 +326,6 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("missing_tile"), EndBlocks.MISSING_TILE)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4)
.setShape("#P", "P#")
.addMaterial(
@ -395,29 +342,24 @@ public class CraftingRecipes {
registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER);
BCLRecipeBuilder.crafting(BetterEnd.makeID("charcoal_block"), EndBlocks.CHARCOAL_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###")
.addMaterial('#', Items.CHARCOAL)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("charcoal_from_block"), Items.CHARCOAL)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(9)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CHARCOAL_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("end_stone_furnace"), EndBlocks.END_STONE_FURNACE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "# #", "###")
.addMaterial('#', Blocks.END_STONE)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("filalux_lantern"), EndBlocks.FILALUX_LANTERN)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###", "###", "###")
.addMaterial('#', EndBlocks.FILALUX)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("silk_moth_hive"), EndBlocks.SILK_MOTH_HIVE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("#L#", "LML", "#L#")
.addMaterial('#', EndBlocks.TENANEA.getBlock("planks"))
.addMaterial('L', EndBlocks.TENANEA_LEAVES)
@ -425,7 +367,6 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("cave_pumpkin_pie"), EndItems.CAVE_PUMPKIN_PIE)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("SBS", "BPB", "SBS")
.addMaterial('P', EndBlocks.CAVE_PUMPKIN)
.addMaterial('B', EndItems.BLOSSOM_BERRY, EndItems.SHADOW_BERRY_RAW)
@ -433,37 +374,31 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("cave_pumpkin_seeds"), EndBlocks.CAVE_PUMPKIN_SEED)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(4)
.setList("#")
.shapeless()
.addMaterial('#', EndBlocks.CAVE_PUMPKIN)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block"), EndBlocks.NEON_CACTUS_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndBlocks.NEON_CACTUS)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block_slab"), EndBlocks.NEON_CACTUS_BLOCK_SLAB)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###")
.setOutputCount(6)
.addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("neon_cactus_block_stairs"), EndBlocks.NEON_CACTUS_BLOCK_STAIRS)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("# ", "## ", "###")
.setOutputCount(4)
.addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("sugar_from_root"), Items.SUGAR)
.checkConfig(Configs.RECIPE_CONFIG)
.setList("###")
.setShape("###")
.addMaterial('#', EndItems.AMBER_ROOT_RAW)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("endstone_flower_pot"), EndBlocks.ENDSTONE_FLOWER_POT)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(3)
.setShape("# #", " # ")
.addMaterial('#', Blocks.END_STONE_BRICKS)
@ -471,33 +406,28 @@ public class CraftingRecipes {
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_block"), EndBlocks.DRAGON_BONE_BLOCK)
.checkConfig(Configs.RECIPE_CONFIG)
.setOutputCount(8)
.setShape("###", "#D#", "###")
.addMaterial('#', Blocks.BONE_BLOCK)
.addMaterial('D', Items.DRAGON_BREATH)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_slab"), EndBlocks.DRAGON_BONE_SLAB)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("###")
.setOutputCount(6)
.addMaterial('#', EndBlocks.DRAGON_BONE_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("dragon_bone_stairs"), EndBlocks.DRAGON_BONE_STAIRS)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("# ", "## ", "###")
.setOutputCount(4)
.addMaterial('#', EndBlocks.DRAGON_BONE_BLOCK)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("smaragdant_crystal"), EndBlocks.SMARAGDANT_CRYSTAL)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("##", "##")
.addMaterial('#', EndBlocks.SMARAGDANT_CRYSTAL_SHARD)
.build();
BCLRecipeBuilder.crafting(BetterEnd.makeID("tined_glass_from_smaragdant"), Blocks.TINTED_GLASS)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape(" # ", "#G#", " # ")
.addMaterial('#', EndBlocks.SMARAGDANT_CRYSTAL_SHARD)
.addMaterial('G', Blocks.GLASS)
@ -506,7 +436,6 @@ public class CraftingRecipes {
private static void registerLantern(String name, Block lantern, Block slab) {
BCLRecipeBuilder.crafting(BetterEnd.makeID(name), lantern)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("S", "#", "S")
.addMaterial('#', EndItems.CRYSTAL_SHARDS)
.addMaterial('S', slab)
@ -516,7 +445,6 @@ public class CraftingRecipes {
public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) {
BCLRecipeBuilder.crafting(BetterEnd.makeID(name), pedestal)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("S", "#", "S")
.addMaterial('S', slab)
.addMaterial('#', pillar)
@ -526,7 +454,6 @@ public class CraftingRecipes {
private static void registerHammer(String name, Item material, Item result) {
BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_hammer"), result)
.checkConfig(Configs.RECIPE_CONFIG)
.setShape("I I", "I#I", " # ")
.addMaterial('I', material)
.addMaterial('#', Items.STICK)

View file

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

View file

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

View file

@ -9,6 +9,7 @@ import org.betterx.betterend.rituals.InfusionRitual;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.core.NonNullList;
import net.minecraft.core.RegistryAccess;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.TagParser;
import net.minecraft.network.FriendlyByteBuf;
@ -72,7 +73,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
}
@Override
public ItemStack assemble(InfusionRitual ritual) {
public ItemStack assemble(InfusionRitual ritual, RegistryAccess acc) {
return output.copy();
}
@ -90,7 +91,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
}
@Override
public ItemStack getResultItem() {
public ItemStack getResultItem(RegistryAccess acc) {
return this.output;
}