Code style changes, entities fixes
This commit is contained in:
paulevsGitch
parent
9d604b2d25
commit
44962e18b6
377 changed files with 5038 additions and 4914 deletions
|
|
@ -1,8 +1,6 @@
|
|||
package ru.betterend.recipe;
|
||||
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.ItemLike;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import ru.betterend.recipe.builders.AlloyingRecipe;
|
||||
import ru.betterend.registry.EndBlocks;
|
||||
|
|
@ -12,43 +10,43 @@ import ru.betterend.registry.EndTags;
|
|||
public class AlloyingRecipes {
|
||||
public static void register() {
|
||||
AlloyingRecipe.Builder.create("additional_iron")
|
||||
.setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON)
|
||||
.setOutput(Items.IRON_INGOT, 3)
|
||||
.setExpiriense(2.1F)
|
||||
.build();
|
||||
.setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON)
|
||||
.setOutput(Items.IRON_INGOT, 3)
|
||||
.setExpiriense(2.1F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_gold")
|
||||
.setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD)
|
||||
.setOutput(Items.GOLD_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
.setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD)
|
||||
.setOutput(Items.GOLD_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_gold")
|
||||
.setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER)
|
||||
.setOutput(Items.COPPER_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_netherite")
|
||||
.setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS)
|
||||
.setOutput(Items.NETHERITE_SCRAP, 3)
|
||||
.setExpiriense(6F)
|
||||
.setSmeltTime(1000)
|
||||
.build();
|
||||
.setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS)
|
||||
.setOutput(Items.NETHERITE_SCRAP, 3)
|
||||
.setExpiriense(6F)
|
||||
.setSmeltTime(1000)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("terminite_ingot")
|
||||
.setInput(Items.IRON_INGOT, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
.setInput(Items.IRON_INGOT, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("aeternium_ingot")
|
||||
.setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_INGOT, 1)
|
||||
.setExpiriense(4.5F)
|
||||
.setSmeltTime(850)
|
||||
.build();
|
||||
.setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_INGOT, 1)
|
||||
.setExpiriense(4.5F)
|
||||
.setSmeltTime(850)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("terminite_ingot_thallasium")
|
||||
.setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
.setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,67 +8,67 @@ import ru.betterend.registry.EndItems;
|
|||
public class AnvilRecipes {
|
||||
public static void register() {
|
||||
AnvilRecipe.Builder.create("ender_pearl_to_dust")
|
||||
.setInput(Items.ENDER_PEARL)
|
||||
.setOutput(EndItems.ENDER_DUST)
|
||||
.setToolLevel(4)
|
||||
.setDamage(5)
|
||||
.build();
|
||||
.setInput(Items.ENDER_PEARL)
|
||||
.setOutput(EndItems.ENDER_DUST)
|
||||
.setToolLevel(4)
|
||||
.setDamage(5)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("ender_shard_to_dust")
|
||||
.setInput(EndItems.ENDER_SHARD)
|
||||
.setOutput(EndItems.ENDER_DUST)
|
||||
.setToolLevel(0)
|
||||
.setDamage(3)
|
||||
.build();
|
||||
|
||||
.setInput(EndItems.ENDER_SHARD)
|
||||
.setOutput(EndItems.ENDER_DUST)
|
||||
.setToolLevel(0)
|
||||
.setDamage(3)
|
||||
.build();
|
||||
|
||||
int anvilLevel = EndToolMaterial.AETERNIUM.getLevel();
|
||||
AnvilRecipe.Builder.create("aeternium_axe_head")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_AXE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_AXE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_pickaxe_head")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_PICKAXE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_PICKAXE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_shovel_head")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_SHOVEL_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_SHOVEL_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_hoe_head")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_HOE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_HOE_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_hammer_head")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_HAMMER_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_HAMMER_HEAD)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_sword_blade")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_SWORD_BLADE)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_SWORD_BLADE)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
AnvilRecipe.Builder.create("aeternium_forged_plate")
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
.setInput(EndItems.AETERNIUM_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.setAnvilLevel(anvilLevel)
|
||||
.setToolLevel(4)
|
||||
.setDamage(6)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,24 +198,24 @@ public class CraftingRecipes {
|
|||
GridRecipe.make(BetterEnd.MOD_ID, "filalux_lantern", EndBlocks.FILALUX_LANTERN).checkConfig(Configs.RECIPE_CONFIG).setShape("###", "###", "###").addMaterial('#', EndBlocks.FILALUX).build();
|
||||
|
||||
GridRecipe.make(BetterEnd.MOD_ID, "silk_moth_hive", EndBlocks.SILK_MOTH_HIVE)
|
||||
.checkConfig(Configs.RECIPE_CONFIG).setShape("#L#", "LML", "#L#")
|
||||
.addMaterial('#', EndBlocks.TENANEA.planks)
|
||||
.addMaterial('L', EndBlocks.TENANEA_LEAVES)
|
||||
.addMaterial('M', EndItems.SILK_MOTH_MATRIX)
|
||||
.build();
|
||||
|
||||
.checkConfig(Configs.RECIPE_CONFIG).setShape("#L#", "LML", "#L#")
|
||||
.addMaterial('#', EndBlocks.TENANEA.planks)
|
||||
.addMaterial('L', EndBlocks.TENANEA_LEAVES)
|
||||
.addMaterial('M', EndItems.SILK_MOTH_MATRIX)
|
||||
.build();
|
||||
|
||||
GridRecipe.make(BetterEnd.MOD_ID, "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).addMaterial('S', Items.SUGAR).build();
|
||||
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setShape("SBS", "BPB", "SBS")
|
||||
.addMaterial('P', EndBlocks.CAVE_PUMPKIN)
|
||||
.addMaterial('B', EndItems.BLOSSOM_BERRY, EndItems.SHADOW_BERRY_RAW).addMaterial('S', Items.SUGAR).build();
|
||||
|
||||
GridRecipe.make(BetterEnd.MOD_ID, "cave_pumpkin_seeds", EndBlocks.CAVE_PUMPKIN_SEED)
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setOutputCount(4)
|
||||
.setList("#")
|
||||
.addMaterial('#', EndBlocks.CAVE_PUMPKIN)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setOutputCount(4)
|
||||
.setList("#")
|
||||
.addMaterial('#', EndBlocks.CAVE_PUMPKIN)
|
||||
.build();
|
||||
|
||||
GridRecipe.make(BetterEnd.MOD_ID, "neon_cactus_block", EndBlocks.NEON_CACTUS_BLOCK).checkConfig(Configs.RECIPE_CONFIG).setShape("##", "##").addMaterial('#', EndBlocks.NEON_CACTUS).build();
|
||||
GridRecipe.make(BetterEnd.MOD_ID, "neon_cactus_block_slab", EndBlocks.NEON_CACTUS_BLOCK_SLAB).checkConfig(Configs.RECIPE_CONFIG).setShape("###").setOutputCount(6).addMaterial('#', EndBlocks.NEON_CACTUS_BLOCK).build();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,102 +8,102 @@ import ru.betterend.registry.EndBlocks;
|
|||
import ru.betterend.registry.EndItems;
|
||||
|
||||
public class SmithingRecipes {
|
||||
|
||||
|
||||
public static void register() {
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_sword_handle")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SWORD_HANDLE)
|
||||
.setBase(EndBlocks.TERMINITE.ingot)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SWORD_HANDLE)
|
||||
.setBase(EndBlocks.TERMINITE.ingot)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_sword")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SWORD)
|
||||
.setBase(EndItems.AETERNIUM_SWORD_BLADE)
|
||||
.setAddition(EndItems.AETERNIUM_SWORD_HANDLE)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SWORD)
|
||||
.setBase(EndItems.AETERNIUM_SWORD_BLADE)
|
||||
.setAddition(EndItems.AETERNIUM_SWORD_HANDLE)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_pickaxe")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_PICKAXE)
|
||||
.setBase(EndItems.AETERNIUM_PICKAXE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_PICKAXE)
|
||||
.setBase(EndItems.AETERNIUM_PICKAXE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_axe")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_AXE)
|
||||
.setBase(EndItems.AETERNIUM_AXE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_AXE)
|
||||
.setBase(EndItems.AETERNIUM_AXE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_shovel")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SHOVEL)
|
||||
.setBase(EndItems.AETERNIUM_SHOVEL_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_SHOVEL)
|
||||
.setBase(EndItems.AETERNIUM_SHOVEL_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_hoe")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HOE)
|
||||
.setBase(EndItems.AETERNIUM_HOE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HOE)
|
||||
.setBase(EndItems.AETERNIUM_HOE_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_hammer")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HAMMER)
|
||||
.setBase(EndItems.AETERNIUM_HAMMER_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HAMMER)
|
||||
.setBase(EndItems.AETERNIUM_HAMMER_HEAD)
|
||||
.setAddition(EndItems.LEATHER_WRAPPED_STICK)
|
||||
.build();
|
||||
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "netherite_hammer")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.NETHERITE_HAMMER)
|
||||
.setBase(EndItems.DIAMOND_HAMMER)
|
||||
.setAddition(Items.NETHERITE_INGOT)
|
||||
.build();
|
||||
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.NETHERITE_HAMMER)
|
||||
.setBase(EndItems.DIAMOND_HAMMER)
|
||||
.setAddition(Items.NETHERITE_INGOT)
|
||||
.build();
|
||||
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_helmet")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HELMET)
|
||||
.setBase(EndBlocks.TERMINITE.helmet)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_HELMET)
|
||||
.setBase(EndBlocks.TERMINITE.helmet)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_chestplate")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_CHESTPLATE)
|
||||
.setBase(EndBlocks.TERMINITE.chestplate)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_CHESTPLATE)
|
||||
.setBase(EndBlocks.TERMINITE.chestplate)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_leggings")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_LEGGINGS)
|
||||
.setBase(EndBlocks.TERMINITE.leggings)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_LEGGINGS)
|
||||
.setBase(EndBlocks.TERMINITE.leggings)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "aeternium_boots")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_BOOTS)
|
||||
.setBase(EndBlocks.TERMINITE.boots)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.AETERNIUM_BOOTS)
|
||||
.setBase(EndBlocks.TERMINITE.boots)
|
||||
.setAddition(EndItems.AETERNIUM_FORGED_PLATE)
|
||||
.build();
|
||||
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "thallasium_anvil_updrade")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndBlocks.TERMINITE.anvilBlock)
|
||||
.setBase(EndBlocks.THALLASIUM.anvilBlock)
|
||||
.setAddition(EndBlocks.TERMINITE.block)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndBlocks.TERMINITE.anvilBlock)
|
||||
.setBase(EndBlocks.THALLASIUM.anvilBlock)
|
||||
.setAddition(EndBlocks.TERMINITE.block)
|
||||
.build();
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "terminite_anvil_updrade")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndBlocks.AETERNIUM_ANVIL)
|
||||
.setBase(EndBlocks.TERMINITE.anvilBlock)
|
||||
.setAddition(EndItems.AETERNIUM_INGOT)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndBlocks.AETERNIUM_ANVIL)
|
||||
.setBase(EndBlocks.TERMINITE.anvilBlock)
|
||||
.setAddition(EndItems.AETERNIUM_INGOT)
|
||||
.build();
|
||||
|
||||
SmithingTableRecipe.create(BetterEnd.MOD_ID, "armored_elytra")
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.ARMORED_ELYTRA)
|
||||
.setBase(Items.ELYTRA)
|
||||
.setAddition(EndItems.AETERNIUM_INGOT)
|
||||
.build();
|
||||
.checkConfig(Configs.RECIPE_CONFIG)
|
||||
.setResult(EndItems.ARMORED_ELYTRA)
|
||||
.setBase(Items.ELYTRA)
|
||||
.setAddition(EndItems.AETERNIUM_INGOT)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package ru.betterend.recipe.builders;
|
|||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
|
@ -29,12 +28,12 @@ import ru.betterend.util.ItemUtil;
|
|||
import ru.betterend.util.RecipeHelper;
|
||||
|
||||
public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
||||
|
||||
|
||||
public final static String GROUP = "alloying";
|
||||
public final static RecipeType<AlloyingRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
|
||||
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer());
|
||||
public final static CategoryIdentifier ID = CategoryIdentifier.of(BetterEnd.MOD_ID, GROUP);
|
||||
|
||||
|
||||
protected final RecipeType<?> type;
|
||||
protected final ResourceLocation id;
|
||||
protected final Ingredient primaryInput;
|
||||
|
|
@ -43,7 +42,7 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
protected final String group;
|
||||
protected final float experience;
|
||||
protected final int smeltTime;
|
||||
|
||||
|
||||
public AlloyingRecipe(ResourceLocation id, String group, Ingredient primaryInput, Ingredient secondaryInput, ItemStack output, float experience, int smeltTime) {
|
||||
this.group = group;
|
||||
this.id = id;
|
||||
|
|
@ -54,11 +53,11 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
this.smeltTime = smeltTime;
|
||||
this.type = TYPE;
|
||||
}
|
||||
|
||||
|
||||
public float getExperience() {
|
||||
return this.experience;
|
||||
}
|
||||
|
||||
|
||||
public int getSmeltTime() {
|
||||
return this.smeltTime;
|
||||
}
|
||||
|
|
@ -68,14 +67,14 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
NonNullList<Ingredient> defaultedList = NonNullList.create();
|
||||
defaultedList.add(primaryInput);
|
||||
defaultedList.add(secondaryInput);
|
||||
|
||||
|
||||
return defaultedList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean matches(Container inv, Level world) {
|
||||
return this.primaryInput.test(inv.getItem(0)) && this.secondaryInput.test(inv.getItem(1)) ||
|
||||
this.primaryInput.test(inv.getItem(1)) && this.secondaryInput.test(inv.getItem(0));
|
||||
this.primaryInput.test(inv.getItem(1)) && this.secondaryInput.test(inv.getItem(0));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -107,22 +106,22 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
public RecipeType<?> getType() {
|
||||
return this.type;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Environment(EnvType.CLIENT)
|
||||
public String getGroup() {
|
||||
return this.group;
|
||||
}
|
||||
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public ItemStack getToastSymbol() {
|
||||
return new ItemStack(EndBlocks.END_STONE_SMELTER);
|
||||
}
|
||||
|
||||
|
||||
public static class Builder {
|
||||
private final static Builder INSTANCE = new Builder();
|
||||
private static boolean exist;
|
||||
|
||||
|
||||
public static Builder create(ResourceLocation id) {
|
||||
INSTANCE.id = id;
|
||||
INSTANCE.group = String.format("%s_%s", GROUP, id);
|
||||
|
|
@ -132,14 +131,14 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
INSTANCE.experience = 0.0F;
|
||||
INSTANCE.smeltTime = 350;
|
||||
exist = Configs.RECIPE_CONFIG.getBoolean("alloying", id.getPath(), true);
|
||||
|
||||
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
|
||||
public static Builder create(String id) {
|
||||
return create(BetterEnd.makeID(id));
|
||||
}
|
||||
|
||||
|
||||
private ResourceLocation id;
|
||||
private Ingredient primaryInput;
|
||||
private Ingredient secondaryInput;
|
||||
|
|
@ -148,14 +147,15 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
private float experience;
|
||||
private int smeltTime;
|
||||
private boolean alright = true;
|
||||
|
||||
private Builder() {}
|
||||
|
||||
|
||||
private Builder() {
|
||||
}
|
||||
|
||||
public Builder setGroup(String group) {
|
||||
this.group = group;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setPrimaryInput(ItemLike... inputs) {
|
||||
for (ItemLike item : inputs) {
|
||||
this.alright &= RecipeHelper.exists(item);
|
||||
|
|
@ -163,7 +163,7 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
this.primaryInput = Ingredient.of(inputs);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setSecondaryInput(ItemLike... inputs) {
|
||||
for (ItemLike item : inputs) {
|
||||
this.alright &= RecipeHelper.exists(item);
|
||||
|
|
@ -171,56 +171,56 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
this.secondaryInput = Ingredient.of(inputs);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setPrimaryInput(Tag<Item> input) {
|
||||
this.primaryInput = Ingredient.of(input);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setSecondaryInput(Tag<Item> input) {
|
||||
this.secondaryInput = Ingredient.of(input);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setInput(ItemLike primaryInput, ItemLike secondaryInput) {
|
||||
this.setPrimaryInput(primaryInput);
|
||||
this.setSecondaryInput(secondaryInput);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setInput(Tag<Item> primaryInput, Tag<Item> secondaryInput) {
|
||||
this.setPrimaryInput(primaryInput);
|
||||
this.setSecondaryInput(secondaryInput);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setOutput(ItemLike output, int amount) {
|
||||
this.alright &= RecipeHelper.exists(output);
|
||||
this.output = new ItemStack(output, amount);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setExpiriense(float amount) {
|
||||
this.experience = amount;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setSmeltTime(int time) {
|
||||
this.smeltTime = time;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public void build() {
|
||||
if (exist) {
|
||||
if (primaryInput == null) {
|
||||
BetterEnd.LOGGER.warning("Primary input for Alloying recipe can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
if(secondaryInput == null) {
|
||||
if (secondaryInput == null) {
|
||||
BetterEnd.LOGGER.warning("Secondary input for Alloying can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
if(output == null) {
|
||||
if (output == null) {
|
||||
BetterEnd.LOGGER.warning("Output for Alloying can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
|
|
@ -236,7 +236,7 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static class Serializer implements RecipeSerializer<AlloyingRecipe> {
|
||||
@Override
|
||||
public AlloyingRecipe fromJson(ResourceLocation id, JsonObject json) {
|
||||
|
|
@ -251,7 +251,7 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
}
|
||||
float experience = GsonHelper.getAsFloat(json, "experience", 0.0F);
|
||||
int smeltTime = GsonHelper.getAsInt(json, "smelttime", 350);
|
||||
|
||||
|
||||
return new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime);
|
||||
}
|
||||
|
||||
|
|
@ -263,7 +263,7 @@ public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
ItemStack output = packetBuffer.readItem();
|
||||
float experience = packetBuffer.readFloat();
|
||||
int smeltTime = packetBuffer.readVarInt();
|
||||
|
||||
|
||||
return new AlloyingRecipe(id, group, primary, secondary, output, experience, smeltTime);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
package ru.betterend.recipe.builders;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
|
@ -31,17 +28,18 @@ import ru.bclib.recipes.BCLRecipeManager;
|
|||
import ru.betterend.BetterEnd;
|
||||
import ru.betterend.config.Configs;
|
||||
import ru.betterend.interfaces.BetterEndRecipe;
|
||||
import ru.betterend.registry.EndTags;
|
||||
import ru.betterend.util.ItemUtil;
|
||||
import ru.betterend.util.RecipeHelper;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
||||
|
||||
|
||||
public final static String GROUP = "smithing";
|
||||
public final static RecipeType<AnvilRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
|
||||
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer());
|
||||
public final static ResourceLocation ID = BetterEnd.makeID(GROUP);
|
||||
|
||||
|
||||
private final ResourceLocation id;
|
||||
private final Ingredient input;
|
||||
private final ItemStack output;
|
||||
|
|
@ -49,7 +47,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
private final int toolLevel;
|
||||
private final int anvilLevel;
|
||||
private final int inputCount;
|
||||
|
||||
|
||||
public AnvilRecipe(ResourceLocation identifier, Ingredient input, ItemStack output, int inputCount, int toolLevel, int anvilLevel, int damage) {
|
||||
this.id = identifier;
|
||||
this.input = input;
|
||||
|
|
@ -69,17 +67,17 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
public ItemStack getResultItem() {
|
||||
return this.output;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean matches(Container craftingInventory, Level world) {
|
||||
return this.matches(craftingInventory);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ItemStack assemble(Container craftingInventory) {
|
||||
return this.output.copy();
|
||||
}
|
||||
|
||||
|
||||
public ItemStack craft(Container craftingInventory, Player player) {
|
||||
if (!player.isCreative()) {
|
||||
if (!checkHammerDurability(craftingInventory, player)) return ItemStack.EMPTY;
|
||||
|
|
@ -96,7 +94,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
int damage = hammer.getDamageValue() + this.damage;
|
||||
return damage < hammer.getMaxDamage();
|
||||
}
|
||||
|
||||
|
||||
public boolean matches(Container craftingInventory) {
|
||||
ItemStack hammer = craftingInventory.getItem(1);
|
||||
if (hammer.isEmpty() || !TagAPI.HAMMERS.contains(hammer.getItem())) {
|
||||
|
|
@ -106,10 +104,10 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
int materialCount = material.getCount();
|
||||
int level = ((TieredItem) hammer.getItem()).getTier().getLevel();
|
||||
return this.input.test(craftingInventory.getItem(0)) &&
|
||||
materialCount >= this.inputCount &&
|
||||
level >= this.toolLevel;
|
||||
materialCount >= this.inputCount &&
|
||||
level >= this.toolLevel;
|
||||
}
|
||||
|
||||
|
||||
public int getDamage() {
|
||||
return this.damage;
|
||||
}
|
||||
|
|
@ -128,7 +126,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
defaultedList.add(Ingredient.of(TagAPI.HAMMERS.getValues().stream().filter(hammer ->
|
||||
((TieredItem) hammer).getTier().getLevel() >= toolLevel).map(ItemStack::new)));
|
||||
defaultedList.add(input);
|
||||
|
||||
|
||||
return defaultedList;
|
||||
}
|
||||
|
||||
|
|
@ -147,7 +145,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
public RecipeType<?> getType() {
|
||||
return TYPE;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isSpecial() {
|
||||
return true;
|
||||
|
|
@ -173,11 +171,11 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
|
||||
public static class Builder {
|
||||
private final static Builder INSTANCE = new Builder();
|
||||
|
||||
|
||||
public static Builder create(String id) {
|
||||
return create(BetterEnd.makeID(id));
|
||||
}
|
||||
|
||||
|
||||
public static Builder create(ResourceLocation id) {
|
||||
INSTANCE.id = id;
|
||||
INSTANCE.input = null;
|
||||
|
|
@ -187,10 +185,10 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
INSTANCE.anvilLevel = 1;
|
||||
INSTANCE.damage = 1;
|
||||
INSTANCE.alright = true;
|
||||
|
||||
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
|
||||
private ResourceLocation id;
|
||||
private Ingredient input;
|
||||
private ItemStack output;
|
||||
|
|
@ -199,20 +197,21 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
private int anvilLevel = 1;
|
||||
private int damage = 1;
|
||||
private boolean alright;
|
||||
|
||||
private Builder() {}
|
||||
|
||||
|
||||
private Builder() {
|
||||
}
|
||||
|
||||
public Builder setInput(ItemLike... inputItems) {
|
||||
this.alright &= RecipeHelper.exists(inputItems);
|
||||
this.setInput(Ingredient.of(inputItems));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setInput(Tag<Item> inputTag) {
|
||||
this.setInput(Ingredient.of(inputTag));
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setInput(Ingredient ingredient) {
|
||||
this.input = ingredient;
|
||||
return this;
|
||||
|
|
@ -222,17 +221,17 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
this.inputCount = count;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setOutput(ItemLike output) {
|
||||
return this.setOutput(output, 1);
|
||||
}
|
||||
|
||||
|
||||
public Builder setOutput(ItemLike output, int amount) {
|
||||
this.alright &= RecipeHelper.exists(output);
|
||||
this.output = new ItemStack(output, amount);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setToolLevel(int level) {
|
||||
this.toolLevel = level;
|
||||
return this;
|
||||
|
|
@ -242,19 +241,19 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
this.anvilLevel = level;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setDamage(int damage) {
|
||||
this.damage = damage;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public void build() {
|
||||
if (Configs.RECIPE_CONFIG.getBoolean("anvil", id.getPath(), true)) {
|
||||
if (input == null) {
|
||||
BetterEnd.LOGGER.warning("Input for Anvil recipe can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
if(output == null) {
|
||||
if (output == null) {
|
||||
BetterEnd.LOGGER.warning("Output for Anvil recipe can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
|
|
@ -285,7 +284,8 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
String nbtData = GsonHelper.getAsString(result, "nbt");
|
||||
CompoundTag nbt = TagParser.parseTag(nbtData);
|
||||
output.setTag(nbt);
|
||||
} catch (CommandSyntaxException ex) {
|
||||
}
|
||||
catch (CommandSyntaxException ex) {
|
||||
BetterEnd.LOGGER.warning("Error parse nbt data for output.", ex);
|
||||
}
|
||||
}
|
||||
|
|
@ -293,7 +293,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
int toolLevel = GsonHelper.getAsInt(json, "toolLevel", 1);
|
||||
int anvilLevel = GsonHelper.getAsInt(json, "anvilLevel", 1);
|
||||
int damage = GsonHelper.getAsInt(json, "damage", 1);
|
||||
|
||||
|
||||
return new AnvilRecipe(id, input, output, inputCount, toolLevel, anvilLevel, damage);
|
||||
}
|
||||
|
||||
|
|
@ -305,7 +305,7 @@ public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
|
|||
int toolLevel = packetBuffer.readVarInt();
|
||||
int anvilLevel = packetBuffer.readVarInt();
|
||||
int damage = packetBuffer.readVarInt();
|
||||
|
||||
|
||||
return new AnvilRecipe(id, input, output, inputCount, toolLevel, anvilLevel, damage);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
package ru.betterend.recipe.builders;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
|
||||
import net.fabricmc.api.EnvType;
|
||||
|
|
@ -28,24 +25,26 @@ import ru.betterend.interfaces.BetterEndRecipe;
|
|||
import ru.betterend.rituals.InfusionRitual;
|
||||
import ru.betterend.util.ItemUtil;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
||||
|
||||
|
||||
public final static String GROUP = "infusion";
|
||||
public final static RecipeType<InfusionRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
|
||||
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer());
|
||||
public final static CategoryIdentifier ID = CategoryIdentifier.of(BetterEnd.MOD_ID, GROUP);
|
||||
|
||||
|
||||
private final ResourceLocation id;
|
||||
private final Ingredient[] catalysts;
|
||||
private Ingredient input;
|
||||
private ItemStack output;
|
||||
private int time = 1;
|
||||
private String group;
|
||||
|
||||
|
||||
private InfusionRecipe(ResourceLocation id) {
|
||||
this(id, null, null);
|
||||
}
|
||||
|
||||
|
||||
private InfusionRecipe(ResourceLocation id, Ingredient input, ItemStack output) {
|
||||
this.id = id;
|
||||
this.input = input;
|
||||
|
|
@ -53,7 +52,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
this.catalysts = new Ingredient[8];
|
||||
Arrays.fill(catalysts, Ingredient.EMPTY);
|
||||
}
|
||||
|
||||
|
||||
public int getInfusionTime() {
|
||||
return this.time;
|
||||
}
|
||||
|
|
@ -77,7 +76,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
public boolean canCraftInDimensions(int width, int height) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public NonNullList<Ingredient> getIngredients() {
|
||||
NonNullList<Ingredient> defaultedList = NonNullList.create();
|
||||
|
|
@ -95,7 +94,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
public ResourceLocation getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Environment(EnvType.CLIENT)
|
||||
public String getGroup() {
|
||||
|
|
@ -111,24 +110,24 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
public RecipeType<?> getType() {
|
||||
return TYPE;
|
||||
}
|
||||
|
||||
|
||||
public static class Builder {
|
||||
private final static Builder INSTANCE = new Builder();
|
||||
private static boolean exist;
|
||||
|
||||
|
||||
public static Builder create(String id) {
|
||||
return create(BetterEnd.makeID(id));
|
||||
}
|
||||
|
||||
|
||||
public static Builder create(ResourceLocation id) {
|
||||
INSTANCE.id = id;
|
||||
INSTANCE.input = null;
|
||||
INSTANCE.output = null;
|
||||
INSTANCE.time = 1;
|
||||
exist = Configs.RECIPE_CONFIG.getBoolean("infusion", id.getPath(), true);
|
||||
|
||||
|
||||
Arrays.fill(INSTANCE.catalysts, Ingredient.EMPTY);
|
||||
|
||||
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
|
|
@ -138,44 +137,44 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
private ItemStack output;
|
||||
private String group;
|
||||
private int time = 1;
|
||||
|
||||
|
||||
private Builder() {
|
||||
Arrays.fill(catalysts, Ingredient.EMPTY);
|
||||
}
|
||||
|
||||
|
||||
public Builder setGroup(String group) {
|
||||
this.group = group;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setInput(ItemLike input) {
|
||||
this.input = Ingredient.of(input);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setOutput(ItemLike output) {
|
||||
this.output = new ItemStack(output);
|
||||
this.output.setCount(1);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setOutput(ItemStack output) {
|
||||
this.output = output;
|
||||
this.output.setCount(1);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder setTime(int time) {
|
||||
this.time = time;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Builder addCatalyst(int slot, ItemLike... items) {
|
||||
if (slot > 7) return this;
|
||||
this.catalysts[slot] = Ingredient.of(items);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public void build() {
|
||||
if (exist) {
|
||||
if (input == null) {
|
||||
|
|
@ -202,7 +201,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static class Serializer implements RecipeSerializer<InfusionRecipe> {
|
||||
@Override
|
||||
public InfusionRecipe fromJson(ResourceLocation id, JsonObject json) {
|
||||
|
|
@ -218,13 +217,14 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
String nbtData = GsonHelper.getAsString(result, "nbt");
|
||||
CompoundTag nbt = TagParser.parseTag(nbtData);
|
||||
recipe.output.setTag(nbt);
|
||||
} catch (CommandSyntaxException ex) {
|
||||
}
|
||||
catch (CommandSyntaxException ex) {
|
||||
BetterEnd.LOGGER.warning("Error parse nbt data for output.", ex);
|
||||
}
|
||||
}
|
||||
recipe.group = GsonHelper.getAsString(json, "group", GROUP);
|
||||
recipe.time = GsonHelper.getAsInt(json, "time", 1);
|
||||
|
||||
|
||||
JsonObject catalysts = GsonHelper.getAsJsonObject(json, "catalysts");
|
||||
ItemStack catalyst = ItemUtil.fromStackString(GsonHelper.getAsString(catalysts, "north", ""));
|
||||
recipe.catalysts[0] = (catalyst != null && !catalyst.isEmpty()) ? Ingredient.of(catalyst.getItem()) : Ingredient.EMPTY;
|
||||
|
|
@ -242,7 +242,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
|
|||
recipe.catalysts[6] = (catalyst != null && !catalyst.isEmpty()) ? Ingredient.of(catalyst.getItem()) : Ingredient.EMPTY;
|
||||
catalyst = ItemUtil.fromStackString(GsonHelper.getAsString(catalysts, "north_west", ""));
|
||||
recipe.catalysts[7] = (catalyst != null && !catalyst.isEmpty()) ? Ingredient.of(catalyst.getItem()) : Ingredient.EMPTY;
|
||||
|
||||
|
||||
return recipe;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue