diff --git a/common/src/main/java/dev/dubhe/anvilcraft/block/MeltGemCauldron.java b/common/src/main/java/dev/dubhe/anvilcraft/block/MeltGemCauldron.java new file mode 100644 index 000000000..9f99f53cb --- /dev/null +++ b/common/src/main/java/dev/dubhe/anvilcraft/block/MeltGemCauldron.java @@ -0,0 +1,29 @@ +package dev.dubhe.anvilcraft.block; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.cauldron.CauldronInteraction; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.AbstractCauldronBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class MeltGemCauldron extends AbstractCauldronBlock { + + public MeltGemCauldron(Properties properties) { + super(properties, CauldronInteraction.EMPTY); + } + + @Override + protected double getContentHeight(BlockState state) { + return 0.9375; + } + + @Override + public boolean isFull(BlockState state) { + return true; + } + + @Override + public int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos) { + return 3; + } +} diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/HeaterRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/HeaterRecipesLoader.java new file mode 100644 index 000000000..569f65f1a --- /dev/null +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/HeaterRecipesLoader.java @@ -0,0 +1,50 @@ +package dev.dubhe.anvilcraft.data.generator.recipe; + +import com.tterrag.registrate.providers.RegistrateRecipeProvider; +import dev.dubhe.anvilcraft.AnvilCraft; +import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen; +import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe; +import dev.dubhe.anvilcraft.init.ModBlocks; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.phys.Vec3; + +import java.util.Map; + +import static dev.dubhe.anvilcraft.api.power.IPowerComponent.OVERLOAD; + +public class HeaterRecipesLoader { + /** + * 初始化加热器配方 + * + * @param provider 提供器 + */ + public static void init(RegistrateRecipeProvider provider) { + AnvilRecipe.Builder.create(RecipeCategory.MISC) + .icon(Items.EMERALD_BLOCK) + .hasBlock(ModBlocks.HEATER.get(), new Vec3(0, -2, 0), Map.entry(OVERLOAD, false)) + .hasBlockIngredient(new Vec3(0, -1, 0), Blocks.CAULDRON) + .hasItemIngredient( + new Vec3(0, -1, 0), + Items.EMERALD_BLOCK, + ModBlocks.RUBY_BLOCK, + ModBlocks.TOPAZ_BLOCK, + ModBlocks.SAPPHIRE_BLOCK + ) + .setBlock(new Vec3(0, -1, 0), ModBlocks.MELT_GEM_CAULDRON.get()) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.EMERALD_BLOCK), AnvilCraftDatagen.has(Items.EMERALD_BLOCK) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModBlocks.RUBY_BLOCK), AnvilCraftDatagen.has(ModBlocks.RUBY_BLOCK) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModBlocks.TOPAZ_BLOCK), AnvilCraftDatagen.has(ModBlocks.TOPAZ_BLOCK) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModBlocks.SAPPHIRE_BLOCK), AnvilCraftDatagen.has(ModBlocks.SAPPHIRE_BLOCK) + ) + .save(provider, AnvilCraft.of("heating/melt_gem_cauldron")); + } +} diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java index 0e15d9213..464cc3321 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java @@ -18,6 +18,7 @@ public static void init(RegistrateRecipeProvider provider) { CompactionRecipesLoader.init(provider); CompressRecipesLoader.init(provider); CookingRecipesLoader.init(provider); + HeaterRecipesLoader.init(provider); ItemInjectRecipesLoader.init(provider); SmashBlockRecipesLoader.init(provider); SievingRecipesLoader.init(provider); diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java index b2cb2f151..17cd62f15 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java @@ -36,6 +36,11 @@ public static void init(RegistrateRecipeProvider provider) { timeWarp(ModBlocks.CINERITE, Items.TUFF, 1, provider); timeWarp(ModBlocks.NETHER_DUST, Items.SOUL_SOIL, 1, provider); timeWarp(ModBlocks.END_DUST, Items.END_STONE, 1, provider); + + timeWarpWithMeltGem(Items.EMERALD, Items.EMERALD_BLOCK, provider); + timeWarpWithMeltGem(ModItems.RUBY, ModBlocks.RUBY_BLOCK, provider); + timeWarpWithMeltGem(ModItems.TOPAZ, ModBlocks.TOPAZ_BLOCK, provider); + timeWarpWithMeltGem(ModItems.SAPPHIRE, ModBlocks.SAPPHIRE_BLOCK, provider); } /** @@ -73,4 +78,23 @@ public static void timeWarpWithWater(ItemLike item, ItemLike item1, RegistrateRe .unlockedBy(AnvilCraftDatagen.hasItem(item), AnvilCraftDatagen.has(item)) .save(provider, AnvilCraft.of("timewarp/" + BuiltInRegistries.ITEM.getKey(item1.asItem()).getPath())); } + + public static void timeWarpWithMeltGem(ItemLike item, ItemLike item1, RegistrateRecipeProvider provider) { + AnvilRecipe.Builder.create(RecipeCategory.MISC) + .icon(item1) + .hasBlock( + ModBlocks.CORRUPTED_BEACON.get(), + new Vec3(0.0, -2.0, 0.0), + Map.entry(CorruptedBeaconBlock.LIT, true) + ) + .hasBlockIngredient( + new Vec3(0, -1, 0), + ModBlocks.MELT_GEM_CAULDRON.get() + ) + .hasItemIngredient(new Vec3(0, -1, 0), item) + .spawnItem(new Vec3(0.0, -1.0, 0.0), item1) + .setBlock(new Vec3(0, -1, 0), Blocks.CAULDRON) + .unlockedBy(AnvilCraftDatagen.hasItem(item), AnvilCraftDatagen.has(item)) + .save(provider, AnvilCraft.of("timewarp/" + BuiltInRegistries.ITEM.getKey(item1.asItem()).getPath())); + } } diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java index 7732d1b26..2ead2b990 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java @@ -8,8 +8,8 @@ import dev.dubhe.anvilcraft.block.entity.CrabTrapBlockEntity; import dev.dubhe.anvilcraft.block.entity.CreativeGeneratorBlockEntity; import dev.dubhe.anvilcraft.block.entity.HeaterBlockEntity; -import dev.dubhe.anvilcraft.block.entity.TransmissionPoleBlockEntity; import dev.dubhe.anvilcraft.block.entity.SimpleChuteBlockEntity; +import dev.dubhe.anvilcraft.block.entity.TransmissionPoleBlockEntity; import dev.dubhe.anvilcraft.client.renderer.blockentity.CorruptedBeaconRenderer; import static dev.dubhe.anvilcraft.AnvilCraft.REGISTRATE; @@ -33,6 +33,12 @@ public class ModBlockEntities { .validBlock(ModBlocks.SIMPLE_CHUTE) .register(); + public static final BlockEntityEntry CRAB_TRAP = REGISTRATE + .blockEntity("crab_trap", CrabTrapBlockEntity::createBlockEntity) + .onRegister(CrabTrapBlockEntity::onBlockEntityRegister) + .validBlock(ModBlocks.CRAB_TRAP) + .register(); + public static final BlockEntityEntry CORRUPTED_BEACON = REGISTRATE .blockEntity("corrupted_beacon", CorruptedBeaconBlockEntity::createBlockEntity) .validBlock(ModBlocks.CORRUPTED_BEACON) @@ -53,13 +59,9 @@ public class ModBlockEntities { .blockEntity("transmission_pole", TransmissionPoleBlockEntity::createBlockEntity) .validBlock(ModBlocks.TRANSMISSION_POLE) .register(); - public static final BlockEntityEntry CRAB_TRAP = REGISTRATE - .blockEntity("crab_trap", CrabTrapBlockEntity::createBlockEntity) - .onRegister(CrabTrapBlockEntity::onBlockEntityRegister) - .validBlock(ModBlocks.CRAB_TRAP) - .register(); + public static final BlockEntityEntry CHARGE_COLLECTOR = REGISTRATE - .blockEntity("crab_trap", ChargeCollectorBlockEntity::createBlockEntity) + .blockEntity("charge_collector", ChargeCollectorBlockEntity::createBlockEntity) .validBlock(ModBlocks.CHARGE_COLLECTOR) .register(); diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java index d6422a15f..4f9c703c8 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java @@ -1,9 +1,5 @@ package dev.dubhe.anvilcraft.init; -import static dev.dubhe.anvilcraft.AnvilCraft.REGISTRATE; -import static dev.dubhe.anvilcraft.api.power.IPowerComponent.OVERLOAD; -import static dev.dubhe.anvilcraft.api.power.IPowerComponent.SWITCH; - import com.tterrag.registrate.providers.RegistrateRecipeProvider; import com.tterrag.registrate.util.entry.BlockEntry; import dev.dubhe.anvilcraft.AnvilCraft; @@ -20,6 +16,7 @@ import dev.dubhe.anvilcraft.block.JewelCraftingTable; import dev.dubhe.anvilcraft.block.LavaCauldronBlock; import dev.dubhe.anvilcraft.block.MagnetBlock; +import dev.dubhe.anvilcraft.block.MeltGemCauldron; import dev.dubhe.anvilcraft.block.PiezoelectricCrystalBlock; import dev.dubhe.anvilcraft.block.ResinBlock; import dev.dubhe.anvilcraft.block.RoyalAnvilBlock; @@ -36,7 +33,6 @@ import dev.dubhe.anvilcraft.item.PlaceInWaterBlockItem; import dev.dubhe.anvilcraft.item.ResinBlockItem; import dev.dubhe.anvilcraft.item.TransmissionPoleBlockItem; -import java.util.Map; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; @@ -58,6 +54,12 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.phys.Vec3; +import java.util.Map; + +import static dev.dubhe.anvilcraft.AnvilCraft.REGISTRATE; +import static dev.dubhe.anvilcraft.api.power.IPowerComponent.OVERLOAD; +import static dev.dubhe.anvilcraft.api.power.IPowerComponent.SWITCH; + public class ModBlocks { public static final BlockEntry STAMPING_PLATFORM = REGISTRATE .block("stamping_platform", StampingPlatformBlock::new) @@ -606,17 +608,77 @@ public class ModBlocks { }) .initialProperties(() -> Blocks.IRON_BLOCK) .tag(BlockTags.MINEABLE_WITH_PICKAXE) - .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) - .pattern("ABA") - .pattern(" B ") - .pattern("ABA") - .define('A', Blocks.QUARTZ_BLOCK) - .define('B', Items.COPPER_INGOT) - .unlockedBy(AnvilCraftDatagen.hasItem(Blocks.QUARTZ_BLOCK), - AnvilCraftDatagen.has(Blocks.CRAFTING_TABLE)) - .unlockedBy(AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), - AnvilCraftDatagen.has(Blocks.CRAFTING_TABLE)) - .save(provider)) + .recipe((ctx, provider) -> { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .pattern("ABA") + .pattern(" B ") + .pattern("ABA") + .define('A', Items.COPPER_INGOT) + .define('B', ModItemTags.QUARTZ_BLOCKS) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), + AnvilCraftDatagen.has(Items.COPPER_INGOT) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModItemTags.QUARTZ_BLOCKS), + AnvilCraftDatagen.has(ModItemTags.QUARTZ_BLOCKS) + ) + .save(provider); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .pattern("ABA") + .pattern(" B ") + .pattern("ABA") + .define('A', Items.COPPER_INGOT) + .define('B', ModItemTags.AMETHYST_BLOCKS) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), + AnvilCraftDatagen.has(Items.COPPER_INGOT) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModItemTags.AMETHYST_BLOCKS), + AnvilCraftDatagen.has(ModItemTags.AMETHYST_BLOCKS) + ) + .save( + provider, + BuiltInRegistries.ITEM.getKey(ctx.get().asItem()) + "_amethyst" + ); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .pattern("ABA") + .pattern(" B ") + .pattern("ABA") + .define('A', Items.COPPER_INGOT) + .define('B', ModItemTags.QUARTZ_BLOCKS_FORGE) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), + AnvilCraftDatagen.has(Items.COPPER_INGOT) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModItemTags.QUARTZ_BLOCKS_FORGE), + AnvilCraftDatagen.has(ModItemTags.QUARTZ_BLOCKS_FORGE) + ) + .save( + provider, + BuiltInRegistries.ITEM.getKey(ctx.get().asItem()) + "_forge" + ); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .pattern("ABA") + .pattern(" B ") + .pattern("ABA") + .define('A', Items.COPPER_INGOT) + .define('B', ModItemTags.AMETHYST_BLOCKS_FORGE) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), + AnvilCraftDatagen.has(Items.COPPER_INGOT) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModItemTags.AMETHYST_BLOCKS_FORGE), + AnvilCraftDatagen.has(ModItemTags.AMETHYST_BLOCKS_FORGE) + ) + .save( + provider, + BuiltInRegistries.ITEM.getKey(ctx.get().asItem()) + "_amethyst_forge" + ); + }) .register(); public static final BlockEntry CHARGE_COLLECTOR = REGISTRATE @@ -634,15 +696,30 @@ public class ModBlocks { .define('A', ModItems.MAGNETOELECTRIC_CORE) .define('B', Items.COPPER_INGOT) .define('C', Items.IRON_INGOT) - .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.FERRITE_CORE_MAGNET_BLOCK), - AnvilCraftDatagen.has(Blocks.CRAFTING_TABLE)) - .unlockedBy(AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), - AnvilCraftDatagen.has(Blocks.CRAFTING_TABLE)) - .unlockedBy(AnvilCraftDatagen.hasItem(Items.IRON_INGOT), - AnvilCraftDatagen.has(Blocks.CRAFTING_TABLE)) + .unlockedBy( + AnvilCraftDatagen.hasItem(ModItems.MAGNETOELECTRIC_CORE), + AnvilCraftDatagen.has(ModItems.MAGNETOELECTRIC_CORE) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.COPPER_INGOT), + AnvilCraftDatagen.has(Items.COPPER_INGOT) + ) + .unlockedBy( + AnvilCraftDatagen.hasItem(Items.IRON_INGOT), + AnvilCraftDatagen.has(Items.IRON_INGOT) + ) .save(provider)) .register(); + public static final BlockEntry MELT_GEM_CAULDRON = REGISTRATE + .block("melt_gem_cauldron", MeltGemCauldron::new) + .initialProperties(() -> Blocks.CAULDRON) + .blockstate((ctx, provider) -> { + }) + .loot((tables, block) -> tables.dropOther(block, Items.CAULDRON)) + .tag(BlockTags.MINEABLE_WITH_PICKAXE) + .register(); + public static void register() { } } diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java index 30a90995c..d240fd154 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java @@ -33,6 +33,8 @@ public class ModItemTags { public static final TagKey TIN_NUGGETS = bindC("tin_nuggets"); public static final TagKey TIN_INGOTS = bindC("tin_ingots"); public static final TagKey COPPER_NUGGETS = bindC("copper_nuggets"); + public static final TagKey QUARTZ_BLOCKS = bindC("quartz_blocks"); + public static final TagKey AMETHYST_BLOCKS = bindC("amethyst_blocks"); public static final TagKey FLOUR_FORGE = bindForge("flour"); public static final TagKey WHEAT_FLOUR_FORGE = bindForge("flour/wheat"); @@ -58,6 +60,9 @@ public class ModItemTags { public static final TagKey TIN_NUGGETS_FORGE = bindForge("tin_nuggets"); public static final TagKey TIN_INGOTS_FORGE = bindForge("tin_ingots"); public static final TagKey COPPER_NUGGETS_FORGE = bindForge("copper_nuggets"); + public static final TagKey QUARTZ_BLOCKS_FORGE = bindForge("quartz_blocks"); + public static final TagKey AMETHYST_BLOCKS_FORGE = bindForge("amethyst_blocks"); + public static final TagKey ROYAL_STEEL_PICKAXE_BASE = bind("royal_steel_pickaxe_base"); public static final TagKey ROYAL_STEEL_AXE_BASE = bind("royal_steel_axe_base"); diff --git a/common/src/main/resources/assets/anvilcraft/blockstates/melt_gem_cauldron.json b/common/src/main/resources/assets/anvilcraft/blockstates/melt_gem_cauldron.json new file mode 100644 index 000000000..4d0629e62 --- /dev/null +++ b/common/src/main/resources/assets/anvilcraft/blockstates/melt_gem_cauldron.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "anvilcraft:block/melt_gem_cauldron" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/anvilcraft/lang/es_es.json b/common/src/main/resources/assets/anvilcraft/lang/es_es.json index 6d825ad9f..b70657e0d 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/es_es.json +++ b/common/src/main/resources/assets/anvilcraft/lang/es_es.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "Pico de acero real", "item.anvilcraft.royal_steel_shovel": "Pala Acero Real", "item.anvilcraft.royal_steel_sword": "Espada Acero Real", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "Plantilla de mejora de acero real", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "Plantilla de herrería", "item.anvilcraft.ruby": "Rubí", "item.anvilcraft.sapphire": "Zafiro", "item.anvilcraft.sea_heart_shell": "Concha de corazón marino", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "Plantilla de mejora de acero real", "screen.anvilcraft.slot.disable.tooltip": "Usar clics en elementos para establecer el filtro", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "Coloque el lingote de acero real", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Pico de amatista Pico de oro Pico de hierro Pico de diamante", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Herramientas o bloques forjados", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "Coloque el pico", "text.autoconfig.anvilcraft.option.anvilEfficiency": "Eficiencia del yunque", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "Número máximo de artículos procesados por el yunque al mismo tiempo", diff --git a/common/src/main/resources/assets/anvilcraft/lang/fr_fr.json b/common/src/main/resources/assets/anvilcraft/lang/fr_fr.json index 6035b10e7..2a6f4df1e 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/fr_fr.json +++ b/common/src/main/resources/assets/anvilcraft/lang/fr_fr.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "Pioche en acier royal", "item.anvilcraft.royal_steel_shovel": "Pelle en acier Royal", "item.anvilcraft.royal_steel_sword": "Épée d'acier royal", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "Modèle de forge d'acier royal", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "Modèle de forge", "item.anvilcraft.ruby": "Rubis", "item.anvilcraft.sapphire": "Saphir", "item.anvilcraft.sea_heart_shell": "Coquille de coeur de mer", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "Modèle de forge-Amélioration royale", "screen.anvilcraft.slot.disable.tooltip": "Utiliser les clics sur les éléments pour définir le filtre", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "Mettre les lingots d'acier royal", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Pioche en améthyste, Pioche en fer, Pioche en or, Pioche en diamant", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Outils ou blocs forgés", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "Mettez la pioche", "text.autoconfig.anvilcraft.option.anvilEfficiency": "Efficacité de l'enclume", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "Nombre maximum d'éléments traités par l'enclume en même temps", diff --git a/common/src/main/resources/assets/anvilcraft/lang/ja_jp.json b/common/src/main/resources/assets/anvilcraft/lang/ja_jp.json index 1fd142ac3..5f411a437 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/ja_jp.json +++ b/common/src/main/resources/assets/anvilcraft/lang/ja_jp.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "王室鋼ツルハシ", "item.anvilcraft.royal_steel_shovel": "王室鋼のシャベル", "item.anvilcraft.royal_steel_sword": "王室鋼の剣", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "王室鋼の鍛冶型", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "鍛冶型", "item.anvilcraft.ruby": "ルビー", "item.anvilcraft.sapphire": "サファイア", "item.anvilcraft.sea_heart_shell": "海のハートの殻", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "鍛冶型-王室鋼の強化", "screen.anvilcraft.slot.disable.tooltip": "アイテムのクリックを使用してフィルターを設定する", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "王室鋼インゴットを入れます", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "紫水晶のツルハシ 金のツルハシ 鉄のツルハシ ダイヤモンドのツルハシ", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "工具または鍛造ブロック", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "ツルハシを入れます", "text.autoconfig.anvilcraft.option.anvilEfficiency": "アンビルの効率", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "金床が同時に処理できるアイテムの最大数", diff --git a/common/src/main/resources/assets/anvilcraft/lang/ko_kr.json b/common/src/main/resources/assets/anvilcraft/lang/ko_kr.json index e62b9fd78..02a532b89 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/ko_kr.json +++ b/common/src/main/resources/assets/anvilcraft/lang/ko_kr.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "왕실 강철 곡괭이", "item.anvilcraft.royal_steel_shovel": "로얄 스틸 삽", "item.anvilcraft.royal_steel_sword": "로얄 스틸 소드", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "로얄 스틸 단조 거푸집 공사", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "단조 거푸집 공사", "item.anvilcraft.ruby": "루비", "item.anvilcraft.sapphire": "사파이어", "item.anvilcraft.sea_heart_shell": "바다 심장 껍질", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "대장간 템플릿-로얄 스틸 업그레이드", "screen.anvilcraft.slot.disable.tooltip": "항목 클릭을 사용하여 필터 설정", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "왕실 강철 주괴 넣어", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "자수정 곡괭이, 금 곡괭이, 철 곡괭이, 다이아몬드 곡괭이", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "도구 또는 단조 블록", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "곡괭이 넣어", "text.autoconfig.anvilcraft.option.anvilEfficiency": "앤빌 효율", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "모루가 동시에 처리하는 최대 항목 수", diff --git a/common/src/main/resources/assets/anvilcraft/lang/lzh.json b/common/src/main/resources/assets/anvilcraft/lang/lzh.json index 9b16b0813..4dbd7457c 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/lzh.json +++ b/common/src/main/resources/assets/anvilcraft/lang/lzh.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "皇家鋼鎬", "item.anvilcraft.royal_steel_shovel": "皇室鋼锨", "item.anvilcraft.royal_steel_sword": "皇室鋼劍", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "皇家鋼鍛模", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "鍛模", "item.anvilcraft.ruby": "赤玉", "item.anvilcraft.sapphire": "青玉", "item.anvilcraft.sea_heart_shell": "海心殼", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "鍛模-皇家之昇", "screen.anvilcraft.slot.disable.tooltip": "執物擊之以設濾", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "置皇家鋼錠", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "紫水玉鎬 金鎬 鐵鎬 鑽石鎬", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "具與鍛塊", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "置鎬", "text.autoconfig.anvilcraft.option.anvilEfficiency": "砧之率", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "砧一時所煉物數之極限", diff --git a/common/src/main/resources/assets/anvilcraft/lang/ru_ru.json b/common/src/main/resources/assets/anvilcraft/lang/ru_ru.json index 13655ec3c..88857cc12 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/ru_ru.json +++ b/common/src/main/resources/assets/anvilcraft/lang/ru_ru.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "Кирка из королевской стали", "item.anvilcraft.royal_steel_shovel": "Королевский стальной лопата", "item.anvilcraft.royal_steel_sword": "Королевский стальной меч", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "Шаблон улучшения королевской стали", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "Шаблон кузнечного дела", "item.anvilcraft.ruby": "Рубин", "item.anvilcraft.sapphire": "Сапфир", "item.anvilcraft.sea_heart_shell": "Ракушка Морского Сердца", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "Шаблон улучшения королевской стали", "screen.anvilcraft.slot.disable.tooltip": "Использование кликов по элементам для установки фильтра", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "Положите слиток королевской стали", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Аметистовая кирка Золотая кирка Железная кирка Алмазная кирка", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Инструменты или кованые блоки", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "Положите кирку", "text.autoconfig.anvilcraft.option.anvilEfficiency": "Эффективность наковальни", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "Максимальное количество предметов, обрабатываемых наковальней одновременно", diff --git a/common/src/main/resources/assets/anvilcraft/lang/zh_cn.json b/common/src/main/resources/assets/anvilcraft/lang/zh_cn.json index 28cfbc3ec..0d735332e 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/zh_cn.json +++ b/common/src/main/resources/assets/anvilcraft/lang/zh_cn.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "皇家钢镐", "item.anvilcraft.royal_steel_shovel": "皇家钢锹", "item.anvilcraft.royal_steel_sword": "皇家钢剑", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "皇家钢锻造模板", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "锻造模板", "item.anvilcraft.ruby": "红宝石", "item.anvilcraft.sapphire": "蓝宝石", "item.anvilcraft.sea_heart_shell": "海心壳", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "皇家升级", "screen.anvilcraft.slot.disable.tooltip": "持物品点击以设置过滤", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "放入皇家钢锭", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "紫水晶镐 金镐 铁镐 钻石镐", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "工具或锻造类方块", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "放入镐子", "text.autoconfig.anvilcraft.option.anvilEfficiency": "铁砧工作效率", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "铁砧可以同时处理的最大物品数量", diff --git a/common/src/main/resources/assets/anvilcraft/lang/zh_hk.json b/common/src/main/resources/assets/anvilcraft/lang/zh_hk.json index 732054723..1fafb255f 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/zh_hk.json +++ b/common/src/main/resources/assets/anvilcraft/lang/zh_hk.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "皇家鋼鎬", "item.anvilcraft.royal_steel_shovel": "皇家鋼鏟", "item.anvilcraft.royal_steel_sword": "皇家鋼劍", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "皇家鋼鍛造模板", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "鍛造模板", "item.anvilcraft.ruby": "紅寶石", "item.anvilcraft.sapphire": "藍寶石", "item.anvilcraft.sea_heart_shell": "海心殼", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "皇家升級", "screen.anvilcraft.slot.disable.tooltip": "持有物品點擊以設置過濾", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "放入皇家鋼錠", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "紫水晶鎬 金鎬 鐵鎬 鑽石鎬", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "工具或鍛造類方塊", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "放入鎬子", "text.autoconfig.anvilcraft.option.anvilEfficiency": "鐵砧工作效率", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "鐵砧可以同時處理的最大物品數量", diff --git a/common/src/main/resources/assets/anvilcraft/lang/zh_tw.json b/common/src/main/resources/assets/anvilcraft/lang/zh_tw.json index 39e7977b1..4211ada89 100644 --- a/common/src/main/resources/assets/anvilcraft/lang/zh_tw.json +++ b/common/src/main/resources/assets/anvilcraft/lang/zh_tw.json @@ -91,7 +91,7 @@ "item.anvilcraft.royal_steel_pickaxe": "皇家鋼鎬", "item.anvilcraft.royal_steel_shovel": "皇家鋼鏟", "item.anvilcraft.royal_steel_sword": "皇家鋼劍", - "item.anvilcraft.royal_steel_upgrade_smithing_template": "皇家鍛造模板", + "item.anvilcraft.royal_steel_upgrade_smithing_template": "鍛造模板", "item.anvilcraft.ruby": "紅寶石", "item.anvilcraft.sapphire": "藍寶石", "item.anvilcraft.sea_heart_shell": "海心殼", @@ -127,7 +127,7 @@ "screen.anvilcraft.royal_steel_upgrade_smithing_template": "鍛造模板-皇家升級", "screen.anvilcraft.slot.disable.tooltip": "持有物品點擊以設置過濾", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "放入皇家鋼錠", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "紫水晶鎬 金鎬 鐵鎬 鑽石鎬", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "工具或鍛造類方塊", "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "放入鎬子", "text.autoconfig.anvilcraft.option.anvilEfficiency": "鐵砧工作效率", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "鐵砧可以同時處理的最大物品數量", diff --git a/common/src/main/resources/assets/anvilcraft/models/block/melt_gem_cauldron.json b/common/src/main/resources/assets/anvilcraft/models/block/melt_gem_cauldron.json new file mode 100644 index 000000000..f64287290 --- /dev/null +++ b/common/src/main/resources/assets/anvilcraft/models/block/melt_gem_cauldron.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/template_cauldron_full", + "textures": { + "bottom": "minecraft:block/cauldron_bottom", + "content": "anvilcraft:block/melt_gem", + "inside": "minecraft:block/cauldron_inner", + "particle": "minecraft:block/cauldron_side", + "side": "minecraft:block/cauldron_side", + "top": "minecraft:block/cauldron_top" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png b/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png new file mode 100644 index 000000000..0e36c3f5a Binary files /dev/null and b/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png differ diff --git a/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png.mcmeta b/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png.mcmeta new file mode 100644 index 000000000..557410d35 --- /dev/null +++ b/common/src/main/resources/assets/anvilcraft/textures/block/melt_gem.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 68918d864..06a220fb2 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -18,6 +18,7 @@ "block.anvilcraft.jewelcrafting_table": "ǝןqɐ⟘ buıʇɟɐɹƆ ןǝʍǝſ", "block.anvilcraft.lava_cauldron": "uoɹpןnɐƆ ɐʌɐꞀ", "block.anvilcraft.magnet_block": "ʞɔoןᗺ ʇǝubɐW", + "block.anvilcraft.melt_gem_cauldron": "uoɹpןnɐƆ ɯǝ⅁ ʇןǝW", "block.anvilcraft.nether_dust": "ʇsnᗡ ɹǝɥʇǝN", "block.anvilcraft.piezoelectric_crystal": "ןɐʇsʎɹƆ ɔıɹʇɔǝןǝozǝıԀ", "block.anvilcraft.quartz_sand": "puɐS zʇɹɐnὉ", diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json index c5cb8a19e..b32bbb078 100644 --- a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -18,6 +18,7 @@ "block.anvilcraft.jewelcrafting_table": "Jewel Crafting Table", "block.anvilcraft.lava_cauldron": "Lava Cauldron", "block.anvilcraft.magnet_block": "Magnet Block", + "block.anvilcraft.melt_gem_cauldron": "Melt Gem Cauldron", "block.anvilcraft.nether_dust": "Nether Dust", "block.anvilcraft.piezoelectric_crystal": "Piezoelectric Crystal", "block.anvilcraft.quartz_sand": "Quartz Sand", diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json index 1426a0d09..8d435869a 100644 --- a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json @@ -6,31 +6,31 @@ "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:copper_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_ferrite_core_magnet_block": { + "has_iron_ingot": { "conditions": { "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:iron_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_iron_ingot": { + "has_magnetoelectric_core": { "conditions": { "items": [ { "items": [ - "minecraft:crafting_table" + "anvilcraft:magnetoelectric_core" ] } ] @@ -46,7 +46,7 @@ }, "requirements": [ [ - "has_ferrite_core_magnet_block", + "has_magnetoelectric_core", "has_copper_ingot", "has_iron_ingot", "has_the_recipe" diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json new file mode 100644 index 000000000..b10f08e9f --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_emerald_block": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ruby_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:ruby_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_sapphire_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sapphire_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:heating/melt_gem_cauldron" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_topaz_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:topaz_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_emerald_block", + "has_ruby_block", + "has_topaz_block", + "has_sapphire_block", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:heating/melt_gem_cauldron" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json index 825264d0f..7973e28c2 100644 --- a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json @@ -6,20 +6,18 @@ "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:copper_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_quartz_block": { + "has_quartz_blocks": { "conditions": { "items": [ { - "items": [ - "minecraft:crafting_table" - ] + "tag": "c:quartz_blocks" } ] }, @@ -34,8 +32,8 @@ }, "requirements": [ [ - "has_quartz_block", "has_copper_ingot", + "has_quartz_blocks", "has_the_recipe" ] ], diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json new file mode 100644 index 000000000..e29370f1e --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_blocks": { + "conditions": { + "items": [ + { + "tag": "c:amethyst_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_amethyst" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_amethyst_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_amethyst" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json new file mode 100644 index 000000000..3bcc31613 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_blocks": { + "conditions": { + "items": [ + { + "tag": "forge:amethyst_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_amethyst_forge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_amethyst_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_amethyst_forge" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json new file mode 100644 index 000000000..c5149c5d0 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_quartz_blocks": { + "conditions": { + "items": [ + { + "tag": "forge:quartz_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_forge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_quartz_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_forge" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json index d7efce812..918b406cf 100644 --- a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json @@ -1,24 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nether_star": { + "has_netherite_crystal_nucleus": { "conditions": { "items": [ { "items": [ - "minecraft:nether_star" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_royal_steel_ingot": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_ingot" + "anvilcraft:netherite_crystal_nucleus" ] } ] @@ -30,25 +18,11 @@ "recipe": "anvilcraft:timewarp/ancient_debris" }, "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten_ingot": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:tungsten_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_tungsten_ingot", - "has_royal_steel_ingot", - "has_nether_star", + "has_netherite_crystal_nucleus", "has_the_recipe" ] ], diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json new file mode 100644 index 000000000..6c27cef44 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_emerald": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/emerald_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_emerald", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/emerald_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json new file mode 100644 index 000000000..b08047e05 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ruby": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:ruby" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/ruby_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ruby", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/ruby_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json new file mode 100644 index 000000000..c2f99e3b2 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sapphire": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sapphire" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/sapphire_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sapphire", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/sapphire_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json new file mode 100644 index 000000000..6cb9b2fea --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/topaz_block" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_topaz": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:topaz" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_topaz", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/topaz_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json b/fabric/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json new file mode 100644 index 000000000..964150b24 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:cauldron" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "anvilcraft:blocks/melt_gem_cauldron" +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/charge_collector.json b/fabric/src/generated/resources/data/anvilcraft/recipes/charge_collector.json index 85edf8829..ae1698a43 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/charge_collector.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/charge_collector.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "anvilcraft:ferrite_core_magnet_block" + "item": "anvilcraft:magnetoelectric_core" }, "B": { "item": "minecraft:copper_ingot" diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json new file mode 100644 index 000000000..8b7b330f4 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json @@ -0,0 +1,70 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "minecraft:emerald_block" + }, + "outcomes": [ + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "anvilcraft:melt_gem_cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:heater" + ], + "state": { + "overload": "false" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "minecraft:cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:emerald_block", + "anvilcraft:ruby_block", + "anvilcraft:topaz_block", + "anvilcraft:sapphire_block" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json index 39605f19a..07c58e5ed 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json @@ -3,10 +3,10 @@ "category": "misc", "key": { "A": { - "item": "minecraft:quartz_block" + "item": "minecraft:copper_ingot" }, "B": { - "item": "minecraft:copper_ingot" + "tag": "c:quartz_blocks" } }, "pattern": [ diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json new file mode 100644 index 000000000..cce4462e5 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "c:amethyst_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json new file mode 100644 index 000000000..f888e9daa --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "forge:amethyst_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json new file mode 100644 index 000000000..bcdf89d0f --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "forge:quartz_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json index e82731e6a..c40c962da 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json @@ -13,6 +13,7 @@ 0.0 ], "result": { + "count": 2, "item": "minecraft:ancient_debris" } } @@ -47,38 +48,6 @@ 0.0 ] }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 4 - }, - "items": [ - "anvilcraft:tungsten_ingot" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 4 - }, - "items": [ - "anvilcraft:royal_steel_ingot" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, { "type": "has_item_ingredient", "match_item": { @@ -86,7 +55,7 @@ "min": 1 }, "items": [ - "minecraft:nether_star" + "anvilcraft:netherite_crystal_nucleus" ] }, "offset": [ diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json new file mode 100644 index 000000000..d713d835d --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "minecraft:emerald_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "minecraft:emerald_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:emerald" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json new file mode 100644 index 000000000..e9a2d4b0b --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:ruby_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:ruby_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:ruby" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json new file mode 100644 index 000000000..28acb3696 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:sapphire_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:sapphire_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sapphire" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json new file mode 100644 index 000000000..7b58ffd55 --- /dev/null +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:topaz_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:topaz_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:topaz" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 05c19761b..7d9d857a1 100644 --- a/fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -29,6 +29,7 @@ "anvilcraft:transmission_pole", "anvilcraft:jewelcrafting_table", "anvilcraft:piezoelectric_crystal", - "anvilcraft:charge_collector" + "anvilcraft:charge_collector", + "anvilcraft:melt_gem_cauldron" ] } \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 68918d864..06a220fb2 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -18,6 +18,7 @@ "block.anvilcraft.jewelcrafting_table": "ǝןqɐ⟘ buıʇɟɐɹƆ ןǝʍǝſ", "block.anvilcraft.lava_cauldron": "uoɹpןnɐƆ ɐʌɐꞀ", "block.anvilcraft.magnet_block": "ʞɔoןᗺ ʇǝubɐW", + "block.anvilcraft.melt_gem_cauldron": "uoɹpןnɐƆ ɯǝ⅁ ʇןǝW", "block.anvilcraft.nether_dust": "ʇsnᗡ ɹǝɥʇǝN", "block.anvilcraft.piezoelectric_crystal": "ןɐʇsʎɹƆ ɔıɹʇɔǝןǝozǝıԀ", "block.anvilcraft.quartz_sand": "puɐS zʇɹɐnὉ", diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index c5cb8a19e..b32bbb078 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -18,6 +18,7 @@ "block.anvilcraft.jewelcrafting_table": "Jewel Crafting Table", "block.anvilcraft.lava_cauldron": "Lava Cauldron", "block.anvilcraft.magnet_block": "Magnet Block", + "block.anvilcraft.melt_gem_cauldron": "Melt Gem Cauldron", "block.anvilcraft.nether_dust": "Nether Dust", "block.anvilcraft.piezoelectric_crystal": "Piezoelectric Crystal", "block.anvilcraft.quartz_sand": "Quartz Sand", diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json index 1426a0d09..8d435869a 100644 --- a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/charge_collector.json @@ -6,31 +6,31 @@ "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:copper_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_ferrite_core_magnet_block": { + "has_iron_ingot": { "conditions": { "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:iron_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_iron_ingot": { + "has_magnetoelectric_core": { "conditions": { "items": [ { "items": [ - "minecraft:crafting_table" + "anvilcraft:magnetoelectric_core" ] } ] @@ -46,7 +46,7 @@ }, "requirements": [ [ - "has_ferrite_core_magnet_block", + "has_magnetoelectric_core", "has_copper_ingot", "has_iron_ingot", "has_the_recipe" diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json new file mode 100644 index 000000000..b10f08e9f --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/heating/melt_gem_cauldron.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_emerald_block": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_ruby_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:ruby_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_sapphire_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sapphire_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:heating/melt_gem_cauldron" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_topaz_block": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:topaz_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_emerald_block", + "has_ruby_block", + "has_topaz_block", + "has_sapphire_block", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:heating/melt_gem_cauldron" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json index 825264d0f..7973e28c2 100644 --- a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal.json @@ -6,20 +6,18 @@ "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:copper_ingot" ] } ] }, "trigger": "minecraft:inventory_changed" }, - "has_quartz_block": { + "has_quartz_blocks": { "conditions": { "items": [ { - "items": [ - "minecraft:crafting_table" - ] + "tag": "c:quartz_blocks" } ] }, @@ -34,8 +32,8 @@ }, "requirements": [ [ - "has_quartz_block", "has_copper_ingot", + "has_quartz_blocks", "has_the_recipe" ] ], diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json new file mode 100644 index 000000000..e29370f1e --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_blocks": { + "conditions": { + "items": [ + { + "tag": "c:amethyst_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_amethyst" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_amethyst_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_amethyst" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json new file mode 100644 index 000000000..3bcc31613 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_amethyst_forge.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_blocks": { + "conditions": { + "items": [ + { + "tag": "forge:amethyst_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_amethyst_forge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_amethyst_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_amethyst_forge" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json new file mode 100644 index 000000000..c5149c5d0 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/piezoelectric_crystal_forge.json @@ -0,0 +1,46 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_quartz_blocks": { + "conditions": { + "items": [ + { + "tag": "forge:quartz_blocks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:piezoelectric_crystal_forge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_quartz_blocks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:piezoelectric_crystal_forge" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json index d7efce812..918b406cf 100644 --- a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ancient_debris.json @@ -1,24 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nether_star": { + "has_netherite_crystal_nucleus": { "conditions": { "items": [ { "items": [ - "minecraft:nether_star" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_royal_steel_ingot": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:royal_steel_ingot" + "anvilcraft:netherite_crystal_nucleus" ] } ] @@ -30,25 +18,11 @@ "recipe": "anvilcraft:timewarp/ancient_debris" }, "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten_ingot": { - "conditions": { - "items": [ - { - "items": [ - "anvilcraft:tungsten_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_tungsten_ingot", - "has_royal_steel_ingot", - "has_nether_star", + "has_netherite_crystal_nucleus", "has_the_recipe" ] ], diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json new file mode 100644 index 000000000..6c27cef44 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/emerald_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_emerald": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/emerald_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_emerald", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/emerald_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json new file mode 100644 index 000000000..b08047e05 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/ruby_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ruby": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:ruby" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/ruby_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ruby", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/ruby_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json new file mode 100644 index 000000000..c2f99e3b2 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/sapphire_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sapphire": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:sapphire" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/sapphire_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_sapphire", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/sapphire_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json new file mode 100644 index 000000000..6cb9b2fea --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/advancements/recipes/misc/timewarp/topaz_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:timewarp/topaz_block" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_topaz": { + "conditions": { + "items": [ + { + "items": [ + "anvilcraft:topaz" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_topaz", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:timewarp/topaz_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json b/forge/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json new file mode 100644 index 000000000..964150b24 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/loot_tables/blocks/melt_gem_cauldron.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:cauldron" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "anvilcraft:blocks/melt_gem_cauldron" +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/charge_collector.json b/forge/src/generated/resources/data/anvilcraft/recipes/charge_collector.json index 85edf8829..ae1698a43 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/charge_collector.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/charge_collector.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "A": { - "item": "anvilcraft:ferrite_core_magnet_block" + "item": "anvilcraft:magnetoelectric_core" }, "B": { "item": "minecraft:copper_ingot" diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json b/forge/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json new file mode 100644 index 000000000..8b7b330f4 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/heating/melt_gem_cauldron.json @@ -0,0 +1,70 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "minecraft:emerald_block" + }, + "outcomes": [ + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "anvilcraft:melt_gem_cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:heater" + ], + "state": { + "overload": "false" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "minecraft:cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:emerald_block", + "anvilcraft:ruby_block", + "anvilcraft:topaz_block", + "anvilcraft:sapphire_block" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json index 39605f19a..07c58e5ed 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal.json @@ -3,10 +3,10 @@ "category": "misc", "key": { "A": { - "item": "minecraft:quartz_block" + "item": "minecraft:copper_ingot" }, "B": { - "item": "minecraft:copper_ingot" + "tag": "c:quartz_blocks" } }, "pattern": [ diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json new file mode 100644 index 000000000..cce4462e5 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "c:amethyst_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json new file mode 100644 index 000000000..f888e9daa --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_amethyst_forge.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "forge:amethyst_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json new file mode 100644 index 000000000..bcdf89d0f --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/piezoelectric_crystal_forge.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "tag": "forge:quartz_blocks" + } + }, + "pattern": [ + "ABA", + " B ", + "ABA" + ], + "result": { + "item": "anvilcraft:piezoelectric_crystal" + }, + "show_notification": true +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json index e82731e6a..c40c962da 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ancient_debris.json @@ -13,6 +13,7 @@ 0.0 ], "result": { + "count": 2, "item": "minecraft:ancient_debris" } } @@ -47,38 +48,6 @@ 0.0 ] }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 4 - }, - "items": [ - "anvilcraft:tungsten_ingot" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, - { - "type": "has_item_ingredient", - "match_item": { - "count": { - "min": 4 - }, - "items": [ - "anvilcraft:royal_steel_ingot" - ] - }, - "offset": [ - 0.0, - -1.0, - 0.0 - ] - }, { "type": "has_item_ingredient", "match_item": { @@ -86,7 +55,7 @@ "min": 1 }, "items": [ - "minecraft:nether_star" + "anvilcraft:netherite_crystal_nucleus" ] }, "offset": [ diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json new file mode 100644 index 000000000..d713d835d --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/emerald_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "minecraft:emerald_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "minecraft:emerald_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "minecraft:emerald" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json new file mode 100644 index 000000000..e9a2d4b0b --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/ruby_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:ruby_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:ruby_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:ruby" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json new file mode 100644 index 000000000..28acb3696 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/sapphire_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:sapphire_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:sapphire_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:sapphire" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json new file mode 100644 index 000000000..7b58ffd55 --- /dev/null +++ b/forge/src/generated/resources/data/anvilcraft/recipes/timewarp/topaz_block.json @@ -0,0 +1,79 @@ +{ + "type": "anvilcraft:anvil_processing", + "icon": { + "item": "anvilcraft:topaz_block" + }, + "outcomes": [ + { + "type": "spawn_item", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "item": "anvilcraft:topaz_block" + } + }, + { + "type": "set_block", + "chance": 1.0, + "offset": [ + 0.0, + -1.0, + 0.0 + ], + "result": { + "block": "minecraft:cauldron" + } + } + ], + "predicates": [ + { + "type": "has_block", + "match_block": { + "blocks": [ + "anvilcraft:corrupted_beacon" + ], + "state": { + "lit": "true" + } + }, + "offset": [ + 0.0, + -2.0, + 0.0 + ] + }, + { + "type": "has_block_ingredient", + "match_block": { + "blocks": [ + "anvilcraft:melt_gem_cauldron" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + }, + { + "type": "has_item_ingredient", + "match_item": { + "count": { + "min": 1 + }, + "items": [ + "anvilcraft:topaz" + ] + }, + "offset": [ + 0.0, + -1.0, + 0.0 + ] + } + ] +} \ No newline at end of file diff --git a/forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 05c19761b..7d9d857a1 100644 --- a/forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -29,6 +29,7 @@ "anvilcraft:transmission_pole", "anvilcraft:jewelcrafting_table", "anvilcraft:piezoelectric_crystal", - "anvilcraft:charge_collector" + "anvilcraft:charge_collector", + "anvilcraft:melt_gem_cauldron" ] } \ No newline at end of file