diff --git a/common/src/main/java/dev/dubhe/anvilcraft/entity/render/AscendingBlockRenderer.java b/common/src/main/java/dev/dubhe/anvilcraft/client/renderer/entity/AscendingBlockRenderer.java similarity index 98% rename from common/src/main/java/dev/dubhe/anvilcraft/entity/render/AscendingBlockRenderer.java rename to common/src/main/java/dev/dubhe/anvilcraft/client/renderer/entity/AscendingBlockRenderer.java index b64100e27..8f6d14f87 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/entity/render/AscendingBlockRenderer.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/client/renderer/entity/AscendingBlockRenderer.java @@ -1,4 +1,4 @@ -package dev.dubhe.anvilcraft.entity.render; +package dev.dubhe.anvilcraft.client.renderer.entity; import com.mojang.blaze3d.vertex.PoseStack; import dev.dubhe.anvilcraft.entity.AnimateAscendingBlockEntity; 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..3c9bdae78 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; @@ -36,7 +32,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 +53,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 +607,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,12 +695,18 @@ 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(); diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModEntities.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModEntities.java index 02c7d12ff..84ccbc3a5 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/init/ModEntities.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/init/ModEntities.java @@ -3,7 +3,7 @@ import com.tterrag.registrate.util.entry.EntityEntry; import dev.dubhe.anvilcraft.AnvilCraft; import dev.dubhe.anvilcraft.entity.AnimateAscendingBlockEntity; -import dev.dubhe.anvilcraft.entity.render.AscendingBlockRenderer; +import dev.dubhe.anvilcraft.client.renderer.entity.AscendingBlockRenderer; import net.minecraft.world.entity.MobCategory; public class ModEntities { 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/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/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/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/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/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/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/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/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