From c19a62b28ff0d23fd237664a55b4508dac284c46 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Fri, 23 Oct 2026 20:06:29 +0200 Subject: [PATCH 01/16] - Added Chiseled Gemstone Blocks - Added Onyx and Moonstone Chiseled Balcite, matching the CMY variants - What was Onyx and Moonstone Chiseled Balcite is now Onyx and Moonstone Engraved Balcite --- .../spectrum/registries/SpectrumBlocks.java | 29 +++++++++++++---- .../registries/SpectrumItemGroups.java | 12 +++++++ .../moonstone_chiseled_basalt.json | 25 +-------------- .../moonstone_chiseled_calcite.json | 25 +-------------- .../moonstone_engraved_basalt.json | 30 ++++++++++++++++++ .../moonstone_engraved_calcite.json | 30 ++++++++++++++++++ .../blockstates/onyx_engraved_basalt.json | 7 ++++ .../blockstates/onyx_engraved_calcite.json | 7 ++++ .../resources/assets/spectrum/lang/en_us.json | 11 +++++++ .../block/moonstone_chiseled_basalt.json | 5 ++- .../block/moonstone_chiseled_calcite.json | 5 ++- .../block/moonstone_engraved_basalt.json | 7 ++++ .../block/moonstone_engraved_calcite.json | 7 ++++ .../models/block/onyx_engraved_basalt.json | 6 ++++ .../models/block/onyx_engraved_calcite.json | 6 ++++ .../item/moonstone_engraved_basalt.json | 3 ++ .../item/moonstone_engraved_calcite.json | 3 ++ .../models/item/onyx_engraved_basalt.json | 3 ++ .../models/item/onyx_engraved_calcite.json | 3 ++ .../models/templates/moonstone_chiseled.json | 2 +- .../textures/block/chiseled_amethyst.png | Bin 0 -> 548 bytes .../textures/block/chiseled_citrine.png | Bin 0 -> 585 bytes .../textures/block/chiseled_moonstone.png | Bin 0 -> 536 bytes .../spectrum/textures/block/chiseled_onyx.png | Bin 0 -> 606 bytes .../textures/block/chiseled_topaz.png | Bin 0 -> 564 bytes .../block/moonstone_chiseled_basalt.png | Bin 5431 -> 1004 bytes .../moonstone_chiseled_basalt.png.mcmeta | 19 +++++++++-- .../block/moonstone_chiseled_calcite.png | Bin 5499 -> 952 bytes .../moonstone_chiseled_calcite.png.mcmeta | 19 +++++++++-- .../block/moonstone_engraved_basalt.png | Bin 0 -> 5431 bytes .../moonstone_engraved_basalt.png.mcmeta | 6 ++++ .../block/moonstone_engraved_calcite.png | Bin 0 -> 5499 bytes .../moonstone_engraved_calcite.png.mcmeta | 6 ++++ .../textures/block/onyx_chiseled_basalt.png | Bin 902 -> 1027 bytes .../block/onyx_chiseled_basalt.png.mcmeta | 19 +++++++++-- .../textures/block/onyx_chiseled_calcite.png | Bin 844 -> 954 bytes .../block/onyx_chiseled_calcite.png.mcmeta | 19 +++++++++-- .../textures/block/onyx_engraved_basalt.png | Bin 0 -> 902 bytes .../block/onyx_engraved_basalt.png.mcmeta | 6 ++++ .../textures/block/onyx_engraved_calcite.png | Bin 0 -> 844 bytes .../block/onyx_engraved_calcite.png.mcmeta | 6 ++++ .../spectrum/textures/block/polished_onyx.png | Bin 606 -> 551 bytes .../tags/block/beacon_base_blocks.json | 1 + .../tags/block/mineable/pickaxe.json | 1 + ..._pedestal_structure_without_moonstone.json | 2 +- .../ink_color_mapping/item/spectrum.json | 4 +++ .../blocks/moonstone_engraved_basalt.json | 19 +++++++++++ .../blocks/moonstone_engraved_calcite.json | 19 +++++++++++ .../blocks/onyx_engraved_basalt.json | 19 +++++++++++ .../blocks/onyx_engraved_calcite.json | 19 +++++++++++ .../general/pedestal_upgrade_moonstone_2.json | 4 +-- .../multiblocks/pedestal_advanced.json | 2 +- .../pedestal_advanced_upgrades.json | 2 +- .../multiblocks/pedestal_complex.json | 10 +++--- .../pedestal_complex_without_moonstone.json | 2 +- .../multiblocks/spirit_instiller.json | 2 +- .../spirit_instiller_upgrades.json | 2 +- ...oonstone_engraved_basalt_from_cluster.json | 28 ++++++++++++++++ ...moonstone_engraved_basalt_from_shards.json | 28 ++++++++++++++++ ...onstone_engraved_calcite_from_cluster.json | 28 ++++++++++++++++ ...oonstone_engraved_calcite_from_shards.json | 28 ++++++++++++++++ .../onyx_engraved_basalt_from_cluster.json | 28 ++++++++++++++++ .../onyx_engraved_basalt_from_shards.json | 28 ++++++++++++++++ .../onyx_engraved_calcite_from_cluster.json | 28 ++++++++++++++++ .../onyx_engraved_calcite_from_shards.json | 28 ++++++++++++++++ .../block/amethyst_chiseled_base_blocks.json | 6 ---- .../data/spectrum/tags/block/basalts.json | 2 ++ .../data/spectrum/tags/block/calcites.json | 2 ++ .../tags/block/structure/gemstones.json | 3 +- .../tags/block/structure/lategame_runes.json | 4 +-- .../tags/block/structure/midgame_runes.json | 4 +-- .../spectrum/tags/block/structure/runes.json | 7 +++- .../data/spectrum/tags/item/basalts.json | 2 ++ .../data/spectrum/tags/item/calcites.json | 2 ++ .../models/block/onyx_chiseled_basalt.json | 2 +- .../models/block/onyx_chiseled_calcite.json | 2 +- 76 files changed, 598 insertions(+), 96 deletions(-) create mode 100644 src/main/resources/assets/spectrum/blockstates/moonstone_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/blockstates/moonstone_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/blockstates/onyx_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/blockstates/onyx_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/models/block/moonstone_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/models/block/moonstone_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/models/block/onyx_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/models/block/onyx_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/models/item/moonstone_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/models/item/moonstone_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/models/item/onyx_engraved_basalt.json create mode 100644 src/main/resources/assets/spectrum/models/item/onyx_engraved_calcite.json create mode 100644 src/main/resources/assets/spectrum/textures/block/chiseled_amethyst.png create mode 100644 src/main/resources/assets/spectrum/textures/block/chiseled_citrine.png create mode 100644 src/main/resources/assets/spectrum/textures/block/chiseled_moonstone.png create mode 100644 src/main/resources/assets/spectrum/textures/block/chiseled_onyx.png create mode 100644 src/main/resources/assets/spectrum/textures/block/chiseled_topaz.png create mode 100644 src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png create mode 100644 src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png.mcmeta create mode 100644 src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png create mode 100644 src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png.mcmeta create mode 100644 src/main/resources/assets/spectrum/textures/block/onyx_engraved_basalt.png create mode 100644 src/main/resources/assets/spectrum/textures/block/onyx_engraved_basalt.png.mcmeta create mode 100644 src/main/resources/assets/spectrum/textures/block/onyx_engraved_calcite.png create mode 100644 src/main/resources/assets/spectrum/textures/block/onyx_engraved_calcite.png.mcmeta create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/moonstone_engraved_basalt.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/moonstone_engraved_calcite.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/onyx_engraved_basalt.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/onyx_engraved_calcite.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_cluster.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_shards.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_cluster.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_shards.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_cluster.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_shards.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_cluster.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_shards.json delete mode 100644 src/main/resources/data/spectrum/tags/block/amethyst_chiseled_base_blocks.json diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index 3dc36c432d..e265b892ab 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -108,6 +108,8 @@ @SuppressWarnings({"unused"}) public class SpectrumBlocks { + public static final DeferredRegister.Blocks REGISTRAR = DeferredRegister.createBlocks(MOD_ID); + private static BlockBehaviour.Properties settings(MapColor mapColor, SoundType blockSoundGroup, float strength) { return BlockBehaviour.Properties.of().mapColor(mapColor).sound(blockSoundGroup).strength(strength); } @@ -120,9 +122,6 @@ private static BlockBehaviour.Properties craftingBlock(MapColor mapColor, SoundT return settings(mapColor, blockSoundGroup, 5.0F, 8.0F).isRedstoneConductor(SpectrumBlocks::never).isViewBlocking(SpectrumBlocks::never).noOcclusion().requiresCorrectToolForDrops(); } - public static final DeferredRegister.Blocks REGISTRAR = DeferredRegister.createBlocks(MOD_ID); - private static final DeferredWorkQueue CLIENT_QUEUE = new DeferredWorkQueue("spectrum_client"); - public static final DeferredBlock PEDESTAL_BASIC_TOPAZ = register(pedestal(blockWithItem("pedestal_basic_topaz", () -> new PedestalBlock(craftingBlock(MapColor.DIAMOND, SpectrumSoundTypes.TOPAZ_BLOCK), BuiltinPedestalVariant.BASIC_TOPAZ), block -> new PedestalBlockItem(block, IS.of(), BuiltinPedestalVariant.BASIC_TOPAZ, "item.spectrum.pedestal.tooltip.basic_topaz")))); public static final DeferredBlock PEDESTAL_BASIC_AMETHYST = register(pedestal(blockWithItem("pedestal_basic_amethyst", () -> new PedestalBlock(craftingBlock(MapColor.COLOR_PURPLE, SoundType.AMETHYST), BuiltinPedestalVariant.BASIC_AMETHYST), block -> new PedestalBlockItem(block, IS.of(), BuiltinPedestalVariant.BASIC_AMETHYST, "item.spectrum.pedestal.tooltip.basic_amethyst")))); public static final DeferredBlock PEDESTAL_BASIC_CITRINE = register(pedestal(blockWithItem("pedestal_basic_citrine", () -> new PedestalBlock(craftingBlock(MapColor.COLOR_YELLOW, SpectrumSoundTypes.CITRINE_BLOCK), BuiltinPedestalVariant.BASIC_CITRINE), block -> new PedestalBlockItem(block, IS.of(), BuiltinPedestalVariant.BASIC_CITRINE, "item.spectrum.pedestal.tooltip.basic_citrine")))); @@ -431,8 +430,8 @@ public static BlockRegistrar moonstoneChiseled(BlockRegistr public static final DeferredBlock AMETHYST_CHISELED_BASALT = register(simple(blockWithItem("amethyst_chiseled_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 5))))); public static final DeferredBlock CITRINE_CHISELED_BASALT = register(simple(blockWithItem("citrine_chiseled_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 7))))); public static final DeferredBlock ONYX_CHISELED_BASALT = register(simple(blockWithItem("onyx_chiseled_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 3))))); - public static final DeferredBlock MOONSTONE_CHISELED_BASALT = register(moonstoneChiseled(blockWithItem("moonstone_chiseled_basalt", () -> new SpectrumCounterDirectionalPlacedBlock(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 12))), SpectrumTextures.BASALT_CAP)); - + public static final DeferredBlock MOONSTONE_CHISELED_BASALT = register(simple(blockWithItem("moonstone_chiseled_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 12))))); + public static final DeferredBlock CALCITE_STAIRS = register(blockWithItem("calcite_stairs", () -> new StairBlock(CALCITE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CALCITE)))); public static final DeferredBlock CALCITE_SLAB = register(blockWithItem("calcite_slab", () -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CALCITE)))); public static final DeferredBlock CALCITE_WALL = register(blockWithItem("calcite_wall", () -> new WallBlock(BlockBehaviour.Properties.ofFullCopy(CALCITE)))); @@ -465,7 +464,19 @@ public static BlockRegistrar moonstoneChiseled(BlockRegistr public static final DeferredBlock AMETHYST_CHISELED_CALCITE = register(simple(blockWithItem("amethyst_chiseled_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 5))))); public static final DeferredBlock CITRINE_CHISELED_CALCITE = register(simple(blockWithItem("citrine_chiseled_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7))))); public static final DeferredBlock ONYX_CHISELED_CALCITE = register(simple(blockWithItem("onyx_chiseled_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3))))); - public static final DeferredBlock MOONSTONE_CHISELED_CALCITE = register(moonstoneChiseled(blockWithItem("moonstone_chiseled_calcite", () -> new SpectrumCounterDirectionalPlacedBlock(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 12))), SpectrumTextures.CALCITE_CAP)); + public static final DeferredBlock MOONSTONE_CHISELED_CALCITE = register(simple(blockWithItem("moonstone_chiseled_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 12))))); + + //public static final DeferredBlock TOPAZ_ENGRAVED_CALCITE = register(simple(blockWithItem("onyx_engraved_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3))))); + //public static final DeferredBlock AMETHYST_ENGRAVED_CALCITE = register(simple(blockWithItem("onyx_engraved_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3))))); + //public static final DeferredBlock CITRINE_ENGRAVED_CALCITE = register(simple(blockWithItem("onyx_engraved_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3))))); + public static final DeferredBlock ONYX_ENGRAVED_CALCITE = register(simple(blockWithItem("onyx_engraved_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 3))))); + public static final DeferredBlock MOONSTONE_ENGRAVED_CALCITE = register(moonstoneChiseled(blockWithItem("moonstone_engraved_calcite", () -> new SpectrumCounterDirectionalPlacedBlock(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 12))), SpectrumTextures.CALCITE_CAP)); + + //public static final DeferredBlock TOPAZ_ENGRAVED_BASALT = register(simple(blockWithItem("onyx_engraved_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 3))))); + //public static final DeferredBlock AMETHYST_ENGRAVED_BASALT = register(simple(blockWithItem("onyx_engraved_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 3))))); + //public static final DeferredBlock CITRINE_ENGRAVED_BASALT = register(simple(blockWithItem("onyx_engraved_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 3))))); + public static final DeferredBlock ONYX_ENGRAVED_BASALT = register(simple(blockWithItem("onyx_engraved_basalt", () -> new Block(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 3))))); + public static final DeferredBlock MOONSTONE_ENGRAVED_BASALT = register(moonstoneChiseled(blockWithItem("moonstone_engraved_basalt", () -> new SpectrumCounterDirectionalPlacedBlock(BlockBehaviour.Properties.ofFullCopy(BASALT_BRICKS.get()).lightLevel(s -> 12))), SpectrumTextures.BASALT_CAP)); public static final DeferredBlock WHITE_SYMBOLIC_CALCITE = register(simple(blockWithItem("white_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7))))); public static final DeferredBlock LIGHT_GRAY_SYMBOLIC_CALCITE = register(simple(blockWithItem("light_gray_symbolic_calcite", () -> new Block(BlockBehaviour.Properties.ofFullCopy(CALCITE_BRICKS.get()).lightLevel(s -> 7))))); @@ -1438,6 +1449,12 @@ private static BlockBehaviour.Properties polishedGemBlock(MapColor mapColor, Sou public static final DeferredBlock POLISHED_ONYX = register(simple(blockWithItem("polished_onyx", () -> new Block(polishedGemBlock(MapColor.COLOR_BLACK, SpectrumSoundTypes.ONYX_BLOCK))))); public static final DeferredBlock POLISHED_MOONSTONE = register(simple(blockWithItem("polished_moonstone", () -> new Block(polishedGemBlock(MapColor.SNOW, SpectrumSoundTypes.MOONSTONE_BLOCK))))); + public static final DeferredBlock CHISELED_TOPAZ = register(simple(blockWithItem("chiseled_topaz", () -> new Block(polishedGemBlock(MapColor.COLOR_CYAN, SpectrumSoundTypes.TOPAZ_BLOCK))))); + public static final DeferredBlock CHISELED_AMETHYST = register(simple(blockWithItem("chiseled_amethyst", () -> new Block(polishedGemBlock(MapColor.COLOR_MAGENTA, SoundType.AMETHYST))))); + public static final DeferredBlock CHISELED_CITRINE = register(simple(blockWithItem("chiseled_citrine", () -> new Block(polishedGemBlock(MapColor.COLOR_YELLOW, SpectrumSoundTypes.CITRINE_BLOCK))))); + public static final DeferredBlock CHISELED_ONYX = register(simple(blockWithItem("chiseled_onyx", () -> new Block(polishedGemBlock(MapColor.COLOR_BLACK, SpectrumSoundTypes.ONYX_BLOCK))))); + public static final DeferredBlock CHISELED_MOONSTONE = register(simple(blockWithItem("chiseled_moonstone", () -> new Block(polishedGemBlock(MapColor.SNOW, SpectrumSoundTypes.MOONSTONE_BLOCK))))); + public static final DeferredBlock TOPAZ_PILLAR = register(singleton(blockWithItem("topaz_pillar", () -> new Block(polishedGemBlock(MapColor.COLOR_CYAN, SpectrumSoundTypes.TOPAZ_BLOCK))), TexturedModel.TOP_BOTTOM_WITH_WALL)); public static final DeferredBlock AMETHYST_PILLAR = register(singleton(blockWithItem("amethyst_pillar", () -> new Block(polishedGemBlock(MapColor.COLOR_MAGENTA, SoundType.AMETHYST))), TexturedModel.TOP_BOTTOM_WITH_WALL)); public static final DeferredBlock CITRINE_PILLAR = register(singleton(blockWithItem("citrine_pillar", () -> new Block(polishedGemBlock(MapColor.COLOR_YELLOW, SpectrumSoundTypes.CITRINE_BLOCK))), TexturedModel.TOP_BOTTOM_WITH_WALL)); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java index d59df48ac5..71c4d3406c 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java @@ -1094,6 +1094,12 @@ public static void registerSubTabs() { entries.accept(SpectrumBlocks.POLISHED_ONYX); entries.accept(SpectrumBlocks.POLISHED_MOONSTONE); + entries.accept(SpectrumBlocks.CHISELED_TOPAZ); + entries.accept(SpectrumBlocks.CHISELED_AMETHYST); + entries.accept(SpectrumBlocks.CHISELED_CITRINE); + entries.accept(SpectrumBlocks.CHISELED_ONYX); + entries.accept(SpectrumBlocks.CHISELED_MOONSTONE); + entries.accept(SpectrumBlocks.TOPAZ_BRICKS); entries.accept(SpectrumBlocks.AMETHYST_BRICKS); entries.accept(SpectrumBlocks.CITRINE_BRICKS); @@ -1137,12 +1143,18 @@ public static void registerSubTabs() { entries.accept(SpectrumBlocks.CITRINE_CHISELED_BASALT); entries.accept(SpectrumBlocks.ONYX_CHISELED_BASALT); entries.accept(SpectrumBlocks.MOONSTONE_CHISELED_BASALT); + entries.accept(SpectrumBlocks.TOPAZ_CHISELED_CALCITE); entries.accept(SpectrumBlocks.AMETHYST_CHISELED_CALCITE); entries.accept(SpectrumBlocks.CITRINE_CHISELED_CALCITE); entries.accept(SpectrumBlocks.ONYX_CHISELED_CALCITE); entries.accept(SpectrumBlocks.MOONSTONE_CHISELED_CALCITE); + entries.accept(SpectrumBlocks.ONYX_ENGRAVED_CALCITE); + entries.accept(SpectrumBlocks.MOONSTONE_ENGRAVED_CALCITE); + entries.accept(SpectrumBlocks.ONYX_ENGRAVED_BASALT); + entries.accept(SpectrumBlocks.MOONSTONE_ENGRAVED_BASALT); + entries.accept(SpectrumBlocks.TOPAZ_GLASS); entries.accept(SpectrumBlocks.AMETHYST_GLASS); entries.accept(SpectrumBlocks.CITRINE_GLASS); diff --git a/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_basalt.json b/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_basalt.json index 7e13bbf7d7..0af132a245 100644 --- a/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_basalt.json +++ b/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_basalt.json @@ -1,30 +1,7 @@ { "variants": { - "facing=down": { - "model": "spectrum:block/moonstone_chiseled_basalt", - "x": 180 - }, - "facing=east": { - "model": "spectrum:block/moonstone_chiseled_basalt", - "x": 90, - "y": 90 - }, - "facing=north": { - "model": "spectrum:block/moonstone_chiseled_basalt", - "x": 90 - }, - "facing=south": { - "model": "spectrum:block/moonstone_chiseled_basalt", - "x": 90, - "y": 180 - }, - "facing=up": { + "": { "model": "spectrum:block/moonstone_chiseled_basalt" - }, - "facing=west": { - "model": "spectrum:block/moonstone_chiseled_basalt", - "x": 90, - "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_calcite.json b/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_calcite.json index 248e89c04f..ff3d1d13c7 100644 --- a/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_calcite.json +++ b/src/main/resources/assets/spectrum/blockstates/moonstone_chiseled_calcite.json @@ -1,30 +1,7 @@ { "variants": { - "facing=down": { - "model": "spectrum:block/moonstone_chiseled_calcite", - "x": 180 - }, - "facing=east": { - "model": "spectrum:block/moonstone_chiseled_calcite", - "x": 90, - "y": 90 - }, - "facing=north": { - "model": "spectrum:block/moonstone_chiseled_calcite", - "x": 90 - }, - "facing=south": { - "model": "spectrum:block/moonstone_chiseled_calcite", - "x": 90, - "y": 180 - }, - "facing=up": { + "": { "model": "spectrum:block/moonstone_chiseled_calcite" - }, - "facing=west": { - "model": "spectrum:block/moonstone_chiseled_calcite", - "x": 90, - "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_basalt.json b/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_basalt.json new file mode 100644 index 0000000000..de49e44003 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_basalt.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 180 + }, + "facing=east": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 90 + }, + "facing=north": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90 + }, + "facing=south": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 180 + }, + "facing=up": { + "model": "spectrum:block/moonstone_engraved_basalt" + }, + "facing=west": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_calcite.json b/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_calcite.json new file mode 100644 index 0000000000..de49e44003 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/moonstone_engraved_calcite.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 180 + }, + "facing=east": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 90 + }, + "facing=north": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90 + }, + "facing=south": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 180 + }, + "facing=up": { + "model": "spectrum:block/moonstone_engraved_basalt" + }, + "facing=west": { + "model": "spectrum:block/moonstone_engraved_basalt", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/onyx_engraved_basalt.json b/src/main/resources/assets/spectrum/blockstates/onyx_engraved_basalt.json new file mode 100644 index 0000000000..f7ee84893d --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/onyx_engraved_basalt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/onyx_engraved_basalt" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/onyx_engraved_calcite.json b/src/main/resources/assets/spectrum/blockstates/onyx_engraved_calcite.json new file mode 100644 index 0000000000..16f1ad084f --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/onyx_engraved_calcite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/onyx_engraved_calcite" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 656cf24689..236816d4d7 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -2317,6 +2317,16 @@ "block.spectrum.liquid_crystal_cauldron": "Liquid Crystal Cauldron", "block.spectrum.midnight_solution_cauldron": "Midnight Solution Cauldron", + "block.spectrum.chiseled_topaz": "Chiseled Topaz", + "block.spectrum.chiseled_amethyst": "Chiseled Amethyst", + "block.spectrum.chiseled_citrine": "Chiseled Citrine", + "block.spectrum.chiseled_moonstone": "Chiseled Moonstone", + "block.spectrum.chiseled_onyx": "Chiseled Onyx", + "block.spectrum.onyx_engraved_calcite": "Onyx Engraved Calcite", + "block.spectrum.onyx_engraved_basalt": "Onyx Engraved Basalt", + "block.spectrum.moonstone_engraved_calcite": "Moonstone Engraved Calcite", + "block.spectrum.moonstone_engraved_basalt": "Moonstone Engraved Basalt", + "book.spectrum.guidebook.abyssal_vines.page0.text": "Serpentine stalks and glowing fruit make for an awfully familiar sight. Though dimmer and leafier, it is easy to see that these hanging vines are related to glow berries.\\\nGiven their paleness and crystalline aura, I guess that centuries of darkness and feeding on [Liquid Crystal](entry://general/liquid_crystal) transformed them into something that feels at home in the cool twilight of the abyss.", "book.spectrum.guidebook.abyssal_vines.page1.text": "*Touch fuzzy get dizzy*", "book.spectrum.guidebook.abyssal_vines.page1.title": "Fuzzy Leaves", @@ -5418,6 +5428,7 @@ "recipeGroup.spectrum.sharestones": "Sharestones", "recipeGroup.spectrum.colorful_azaleas_ink": "Ink from Colorful Azaleas", "recipeGroup.spectrum.gemstone_bricks": "Gemstone Bricks", + "recipeGroup.spectrum.symbolics": "Symbolic Blocks", "spectrum.gui.guidebook.reveal_hint_button.text": "Uncover Insight ", "spectrum.gui.guidebook.reveal_hint_button.tooltip.lacking_resource": "You do not have this in your inventory", diff --git a/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_basalt.json b/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_basalt.json index 1003d71a27..bb821d2215 100644 --- a/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_basalt.json +++ b/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_basalt.json @@ -1,7 +1,6 @@ { - "parent": "spectrum:templates/moonstone_chiseled", + "parent": "minecraft:block/cube_all", "textures": { - "line": "spectrum:block/moonstone_chiseled_basalt", - "side": "spectrum:block/basalt_cap" + "all": "spectrum:block/moonstone_chiseled_basalt" } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_calcite.json b/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_calcite.json index 853230da24..b3f5dfe0eb 100644 --- a/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_calcite.json +++ b/src/main/resources/assets/spectrum/models/block/moonstone_chiseled_calcite.json @@ -1,7 +1,6 @@ { - "parent": "spectrum:templates/moonstone_chiseled", + "parent": "minecraft:block/cube_all", "textures": { - "line": "spectrum:block/moonstone_chiseled_calcite", - "side": "spectrum:block/calcite_cap" + "all": "spectrum:block/moonstone_chiseled_calcite" } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/moonstone_engraved_basalt.json b/src/main/resources/assets/spectrum/models/block/moonstone_engraved_basalt.json new file mode 100644 index 0000000000..618c94f3f1 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/moonstone_engraved_basalt.json @@ -0,0 +1,7 @@ +{ + "parent": "spectrum:templates/moonstone_chiseled", + "textures": { + "line": "spectrum:block/moonstone_engraved_basalt", + "side": "spectrum:block/basalt_cap" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/moonstone_engraved_calcite.json b/src/main/resources/assets/spectrum/models/block/moonstone_engraved_calcite.json new file mode 100644 index 0000000000..f4f2142a71 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/moonstone_engraved_calcite.json @@ -0,0 +1,7 @@ +{ + "parent": "spectrum:templates/moonstone_chiseled", + "textures": { + "line": "spectrum:block/moonstone_engraved_calcite", + "side": "spectrum:block/calcite_cap" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/onyx_engraved_basalt.json b/src/main/resources/assets/spectrum/models/block/onyx_engraved_basalt.json new file mode 100644 index 0000000000..aa84da7213 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/onyx_engraved_basalt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/onyx_engraved_basalt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/onyx_engraved_calcite.json b/src/main/resources/assets/spectrum/models/block/onyx_engraved_calcite.json new file mode 100644 index 0000000000..2478a6347f --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/onyx_engraved_calcite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/onyx_engraved_calcite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/moonstone_engraved_basalt.json b/src/main/resources/assets/spectrum/models/item/moonstone_engraved_basalt.json new file mode 100644 index 0000000000..bbead3f756 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/moonstone_engraved_basalt.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/moonstone_engraved_basalt" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/moonstone_engraved_calcite.json b/src/main/resources/assets/spectrum/models/item/moonstone_engraved_calcite.json new file mode 100644 index 0000000000..50504cea13 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/moonstone_engraved_calcite.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/moonstone_engraved_calcite" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/onyx_engraved_basalt.json b/src/main/resources/assets/spectrum/models/item/onyx_engraved_basalt.json new file mode 100644 index 0000000000..a49558019d --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/onyx_engraved_basalt.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/onyx_engraved_basalt" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/onyx_engraved_calcite.json b/src/main/resources/assets/spectrum/models/item/onyx_engraved_calcite.json new file mode 100644 index 0000000000..d1f920d8f9 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/onyx_engraved_calcite.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/onyx_engraved_calcite" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/templates/moonstone_chiseled.json b/src/main/resources/assets/spectrum/models/templates/moonstone_chiseled.json index 161da1d19f..88ee125a61 100644 --- a/src/main/resources/assets/spectrum/models/templates/moonstone_chiseled.json +++ b/src/main/resources/assets/spectrum/models/templates/moonstone_chiseled.json @@ -3,7 +3,7 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "line": "spectrum:block/moonstone_chiseled_basalt", + "line": "spectrum:block/moonstone_engraved_basalt", "particle": "spectrum:block/basalt_cap", "side": "spectrum:block/basalt_cap" }, diff --git a/src/main/resources/assets/spectrum/textures/block/chiseled_amethyst.png b/src/main/resources/assets/spectrum/textures/block/chiseled_amethyst.png new file mode 100644 index 0000000000000000000000000000000000000000..3d13b39855827a1923b5110345743d03a05af882 GIT binary patch literal 548 zcmV+<0^9wGP)PVXNQdXKR6fhk8p76q^rS)0q>q)EW%2# zp7LE?7z{^`A3OzsBqhy;qKbw+aozbC0InnjpnnXV;Y;QA+h#BvuH`*J4wl4IKrOxWcKs-7k55RQX)&r%V)GA0MHp!(Lf`L$@@32abi_8kn1QW=rwzN zO>c9Hu!6W*G{enumi`I}pfhw@hl@*_@oi6L2okp{8hKXM>O4w*(&7A5sG@P?=OK2s zC#Rtq8UGV%b^hb`ulOAh_m!k9eJW@a6VETOIZbFb6x7&qO62kFs~0$o**i+10l?w( zmp;EsF(^q17M3ODiS|5LPu=-gmJ}3}d8_yDJ>sfxmv5q&^1b=HxgqK7`cD`JyX`*T m-Emd8UM+4&y4&t|+xSdOR++a2A= z3mjOEP2KrKiv0avY3vQ|-nj(8rVElurm`3FiF7)O0#FrJuIYj*DlswjU2kzUpDuEQ zc#QqmBQIXr07}LZ;C0@hD$HYe)~EnDczFo0-RG4RK($^3(AXQ4Yw44&j}f`{2 z*3IsRU!|?c#{()QHl)PH&(Gr!+)6CJ4$ce38|TZ}W$-5^o7%A50bo-%l|^A^d)>WF zU7NZQIRMsQFR&aoU3iS~hWSMD7%S{-|M<2P*EV%UTkklo z8+lb>VRJOFoK*Hg*d6;^M>aLx$cM9A&6xn@nqD#xwW%wv1v}hF=m^lKJVe2X=|=vf z>*ol0_&9yEZy)Wmuo;Mp;95=SMp`yCkJ&s2HeCQjHnnP9d;jLsN`3X}!2L%&9AFlD zxJp{2BV4HpYc-<+Jl#Dk89eX6a>NMUKr+d4jVlh@o%uuplGS=~6~bA$mba<9i8CNA z{!--2>+35LUrem7Ds1x}FP@IL2+1VZZ)3eBjE6n?S~E*)hAMN)?|IAGFr2xQ6-T&MzttXc8{yfkyC&Ka61Ll;8{cu0nHOesWx zxE?$iJV-SLC)Ev-OhL6EOD%HY%K0fr$V0=s@7}xbd*2iJ87(##fyWqefyWUS8K)L2 z^erOBofO@ZdjNRz)&PLuTH5s$te8a$1mO|)&o5NBU0=EEbOOI52~9`lX_*hpe5c(; zL^W8f(2&=9(DDG__;4EMsbM-;Ci7G^WSrtPR*$#Y60VzEL?LOn81WuAI_ zyRO?1b9&k7keV72qw>^dRF7=q!6Xj*+AaWi`Qmjs^s{i?MgkCreLNbbBj%+Oiox$y zaoqlClyRDIYTC?o8_2WMZX-!>Ew}gUhUt*y5{S&xI8T%0W_|M=0GKv2ZHB^(J4h#?^S2fBJjJ! z?^VZx>2jW?#fm@we!)QHUh5&_bUc`NtyRBQ#a}J}Fb+O_yTARb4beWT`D%rj)2GfF art=>GTm0*MGn*U$0000Px%7)eAyR5*=wlfiBhQ51&1xgliAOrS6sZ9*zBB{5wPDs0LE7fsx=@Bt>KOHp2+ zD_@{V_sRpfbXVg-7N`kR4GULjv>_45Es@M1VKL)km`iEu+031D?>YbZ|8tI3J9-`F z1BaV76m4REUpC3vRrNm z5qJ^+VOngjf(pe3-pq%Iix`SF0_&r(Fug206P5M4ZjEL7~{-qI*I%RUscZcr%}*4?=O=%BWIH z)*0rpgL&*wvd%WTBgf|e+}nG!*1((j0PG*O_}V|EFPmJx=m3ySRa9`H*kCm1Y$Qw! zMH@41AjfdgJ>h!7*rs!LrOy{eg9G}qi8u2RriHkg^b}tJU9%MOb##F4kEbj`NzSe^ zox70+IlIcYkEa{KG2(RYs=>PM&j${>J9QSJj6_@-sG(VelBAD9h|d6lC($*Fp=hhB zR2Sml|5?(HIt1%+hSex%Qx(cbty`BTUYwiDG#W&-wFjkVVVo^4JEpa}Q&)?#G}zE0 sey44x%Hh&jm$@{e?@c?j_AavH#-}o z#gk_MurD0|0G;^j0hJ{eNeuzO;rIwWoQ#e2o;|SBQq;A|w5AgvGN%xAt)U){k20q~ z$D*!@x@M;(p0@a|%8~@5P@x+m8>x&!F$yL0xX_I~(;7X!4*-lp3*@J{PHKky$54i?Yt=f0000)*n*aaXyR@=yWFTVc@fL#DOB7x-bD1eHQO{JG_ z>4lzt56b{BR)1Uoeyt`6JOFxwZB{eW+o32wJ9Cb0x^QwRtST&?`Dz5X%;KW$c+QNT zy0t_bU@6OSOT^@P!F3$~JTLSm_T|?~mgCya)^DYCjDg9av0LuUftIB~xojv`YfZ}U3E&5s~#?I!~O0Mhhys(k=UY>R< zMwVG7`dYu6IGtZBv8FjvHknY8D8%-v9g)D|%z08aZL_NFYiCQj0j$gKbtV z+Zi4m_kU}(3nzypv&wdqh&jKY$M&k0u0T$_ z^X1^H7nuO>e)a`3QC}@IdI+n^M%KGHx5UOo5(U3jOKQ=pUkj2bFi#ifmUv!(?RbU; zhnQIa0*a3rY}rn;_B=1dV=91aKi>58CJq;Ex_=N91*Svuoc}w|C74FK-ebD=#(WdAyi>jRuzYpHv!0@aNk=!gXBQa4@OG*YYd!@d0qpun1<##QdL z$qFY^9!lgM4{nKwZSB9;)2!&*sY^RN{OL|s^p|&dpres15J{LM2CWUiU5SPH1-*%f zNq@#eV>JH3L*Fy!Xc;kj17}S=n1_KQV}9l6j*gw($>1Yh6`e31LVKQ#KmPiCJQV*} z5Zl_Bl$=cGie=c~1hhn3Ou3H-SW`u#!9%_5U8-DnHx1eYM|l9Q<`*8$gChSxIMZ&S zJdpB3cu+zkoLtMLE^ StmhU000001O^bQ@{;!gk!&OZ0-_>dOC5B? z0j9N7Xm!+93W!5n5oH&|C5|XsL`zwuDj1PX7I9tzDxT>%b3AAIpE)Pz-TN)S`+dLr zefQk^IWN%1+;pia008EGzT9B+YY6}b!2EgWs4{po5dHM0ghr@>p(IeQkO@U%1XLx< z5fD*}gaDv!-@hs9Ks~r%s?TZ%rrPj1f8;~>t?AC448O@=wK=;2 zbDS>a2cPNlw^S-cawqf6=Y-`YD~ld>JXM`FJXOY8f*7K|ygF?IsOR#49 z7~GSAiJKNS1vla&93^|hmiup=Fb-IH$jaKMwxYAMiGQoMadS8}+{1DT7{pmRcw2uo zc;VP}{6(|BjdfS;u+ZMa&fjkua<#;#K2bqJ%Jgh(5)l=F3%&za- zdPB_u+b?gj!Pl69=m-v^7(w5JM&yh?jEkfe)0sU52}QH z5A>W^Wo243X}dGT!lugDFz!i5WFKQEK%t%Lwd?G({K7GKw6f{kj*t6BWkGSf)}`%J z6c^`xkck#(q6jU-hyZ_P5AQA^}#g#rM3omvhF;t&fEnIJ(Io*$Qk*R9WjWdae*(hr$bHwNs=XA<0K zbS8mDp;8DCAE6TvGS!vNpurGb=sE|=PpVWwQURiaLcv``C=L@A3fyQkhyc^6Fo8yb zCy3K(IQi#y1gv4{B(m}x}lz>Tr`2trr0$<1=5oj=-L}0i= zOag^WVNfYl5*BcbtX|*q&fC7SR_pTU)H+z0ogN~?kiHF>nH0)Gd&f8#LvuTrecx4nLtqA7A#0G zlY$aTL|}cKDAtTh5DQ6T5cK?*E!bCb(H|89f>r{RLL)$K478pEbeI5x%oM|GbfrwFN`e%KM-0j%$`x9mdagjn*{%BM?P!u>5#2tZlo3cw!W_!*#Mxwt zx)bA7wrt{m@xj&`%sFCEzZn^NbfG69@%2$S%NH8!pZS~Jhd*-(5PZMLJMsITuJ?4k z69eyL{Jy&0)Addayp!?!>iWOYW%}kZg-FpGP!jr7s`I>X1$}1C<8Sog0>1$dfZm+v z+7VP@BKO^_1OT(ey1xN%xWEP#VpV&Nv7Rksh^)x<3p*Z7u#fwtlRzJT266qR1yW^dT# zDRZ8-ODCuYF)_Q%n`kKakHHk$`16E_v_Az}b8&1V7)f4pfG zS!0KJeurb#x&ZioqqPArIbbB-9a}$Con@R~8rIPFV$@)Chdodfso*7wuY{JCW+F}N zPseuu-rVG%vEJ4>WWa52IY3yeVJBBEzn}cG6_ZywE$;qhLR++T|0J%aH%Az1Fm9X$FAtc0zuX-TA1af`tnra}tkF@GVu|*xI7J zFCHv+`l+Ve$ssN&j(=FYNPBQVTv0X{G7LTuS1iPAIn7Hw)iX}L_1GDjIG#vYASG<@D`ZYb6!#`peAZ939eu*GU%_ltYWmN$H}8-vb!TT**M zr|)pM6+KylA6&aQT6?LKG(6P|9=g2%_=odQPJB(c$c?Rv#vX_<=7nJ3T?2Z z%4hjW|IR12xNPkBSlX8I%ds6hfR;?dYu$%-?z;JONf))dK6l^Z<9!C((i9#KYfm<@ z$}0~(O&cp{#B}c&1pDkeoy*FP(>)#=totb;KE2K8tcUgapvDZ(DN}B*NBf9pb?dTZ zOU#xj`KiFe(QJ}^&+`;$r0qQK8a8{!0LU)t!W0Wy>>EmNewXT5XLMnnQ(@6?Cp^_U zK8x?q_iQj)OG${YYp`$LJ(7tX@gL6&#hr}K7>@2>)T*P|&8M;5htZe{wYes(LupfA zonV7T<}DfVU9%9`g7h01#X7I@2~rN0?;G@JkGr>ykt(tLwA74q4DGr$KF_Xs|FX9i(qU;hxspE_}CVd!dobc3CZCtlXY9|_O;s-|s2V%ORR z8ZI>9vvjBI@Oy=f)7bA*J%za3sIq?#El$WlRWsE2*z?AgJ@k)`TlMiKIxo5Av$Nv5 zUy{Mw=EL?kTR8_G&vU}v=)(M{b27@qie{W*?ESZ=KXos$Vus(9)_Xh-Nd4a2E_52mCHSvI)M29%6u>cObXKGdlf0PyRkq diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_basalt.png.mcmeta b/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_basalt.png.mcmeta index 5cc283ac57..6440476f0e 100644 --- a/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_basalt.png.mcmeta +++ b/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_basalt.png.mcmeta @@ -1,6 +1,21 @@ { "animation": { - "frametime": 2, - "interpolate": true + "frametime": 20, + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 90 + }, + + 1, + + { + "index": 1, + "time": 10 + }, + + 0 + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png b/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png index 202354ce3c8c0507b0ce56a03ee46b57106519a0..b30bb1dd54f4603192b46c252f9f989256fb2244 100644 GIT binary patch delta 944 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 BTvq@9 diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png.mcmeta b/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png.mcmeta index 5cc283ac57..6440476f0e 100644 --- a/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png.mcmeta +++ b/src/main/resources/assets/spectrum/textures/block/moonstone_chiseled_calcite.png.mcmeta @@ -1,6 +1,21 @@ { "animation": { - "frametime": 2, - "interpolate": true + "frametime": 20, + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 90 + }, + + 1, + + { + "index": 1, + "time": 10 + }, + + 0 + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png new file mode 100644 index 0000000000000000000000000000000000000000..127c2e4866f4bc3686fc6a14ceb99e0a00484ab2 GIT binary patch literal 5431 zcmeHKc~nzZ8h=1A0zy#n0HXLBt57gxg)B{!B?u@>1O^bQ@{;!gk!&OZ0-_>dOC5B? z0j9N7Xm!+93W!5n5oH&|C5|XsL`zwuDj1PX7I9tzDxT>%b3AAIpE)Pz-TN)S`+dLr zefQk^IWN%1+;pia008EGzT9B+YY6}b!2EgWs4{po5dHM0ghr@>p(IeQkO@U%1XLx< z5fD*}gaDv!-@hs9Ks~r%s?TZ%rrPj1f8;~>t?AC448O@=wK=;2 zbDS>a2cPNlw^S-cawqf6=Y-`YD~ld>JXM`FJXOY8f*7K|ygF?IsOR#49 z7~GSAiJKNS1vla&93^|hmiup=Fb-IH$jaKMwxYAMiGQoMadS8}+{1DT7{pmRcw2uo zc;VP}{6(|BjdfS;u+ZMa&fjkua<#;#K2bqJ%Jgh(5)l=F3%&za- zdPB_u+b?gj!Pl69=m-v^7(w5JM&yh?jEkfe)0sU52}QH z5A>W^Wo243X}dGT!lugDFz!i5WFKQEK%t%Lwd?G({K7GKw6f{kj*t6BWkGSf)}`%J z6c^`xkck#(q6jU-hyZ_P5AQA^}#g#rM3omvhF;t&fEnIJ(Io*$Qk*R9WjWdae*(hr$bHwNs=XA<0K zbS8mDp;8DCAE6TvGS!vNpurGb=sE|=PpVWwQURiaLcv``C=L@A3fyQkhyc^6Fo8yb zCy3K(IQi#y1gv4{B(m}x}lz>Tr`2trr0$<1=5oj=-L}0i= zOag^WVNfYl5*BcbtX|*q&fC7SR_pTU)H+z0ogN~?kiHF>nH0)Gd&f8#LvuTrecx4nLtqA7A#0G zlY$aTL|}cKDAtTh5DQ6T5cK?*E!bCb(H|89f>r{RLL)$K478pEbeI5x%oM|GbfrwFN`e%KM-0j%$`x9mdagjn*{%BM?P!u>5#2tZlo3cw!W_!*#Mxwt zx)bA7wrt{m@xj&`%sFCEzZn^NbfG69@%2$S%NH8!pZS~Jhd*-(5PZMLJMsITuJ?4k z69eyL{Jy&0)Addayp!?!>iWOYW%}kZg-FpGP!jr7s`I>X1$}1C<8Sog0>1$dfZm+v z+7VP@BKO^_1OT(ey1xN%xWEP#VpV&Nv7Rksh^)x<3p*Z7u#fwtlRzJT266qR1yW^dT# zDRZ8-ODCuYF)_Q%n`kKakHHk$`16E_v_Az}b8&1V7)f4pfG zS!0KJeurb#x&ZioqqPArIbbB-9a}$Con@R~8rIPFV$@)Chdodfso*7wuY{JCW+F}N zPseuu-rVG%vEJ4>WWa52IY3yeVJBBEzn}cG6_ZywE$;qhLR++T|0J%aH%Az1Fm9X$FAtc0zuX-TA1af`tnra}tkF@GVu|*xI7J zFCHv+`l+Ve$ssN&j(=FYNPBQVTv0X{G7LTuS1iPAIn7Hw)iX}L_1GDjIG#vYASG<@D`ZYb6!#`peAZ939eu*GU%_ltYWmN$H}8-vb!TT**M zr|)pM6+KylA6&aQT6?LKG(6P|9=g2%_=odQPJB(c$c?Rv#vX_<=7nJ3T?2Z z%4hjW|IR12xNPkBSlX8I%ds6hfR;?dYu$%-?z;JONf))dK6l^Z<9!C((i9#KYfm<@ z$}0~(O&cp{#B}c&1pDkeoy*FP(>)#=totb;KE2K8tcUgapvDZ(DN}B*NBf9pb?dTZ zOU#xj`KiFe(QJ}^&+`;$r0qQK8a8{!0LU)t!W0Wy>>EmNewXT5XLMnnQ(@6?Cp^_U zK8x?q_iQj)OG${YYp`$LJ(7tX@gL6&#hr}K7>@2>)T*P|&8M;5htZe{wYes(LupfA zonV7T<}DfVU9%9`g7h01#X7I@2~rN0?;G@JkGr>ykt(tLwA74q4DGr$KF_Xs|FX9i(qU;hxspE_}CVd!dobc3CZCtlXY9|_O;s-|s2V%ORR z8ZI>9vvjBI@Oy=f)7bA*J%za3sIq?#El$WlRWsE2*z?AgJ@k)`TlMiKIxo5Av$Nv5 zUy{Mw=EL?kTR8_G&vU}v=)(M{b27@qie{W*?ESZ=KXos$Vus(9)_Xh-Nd4a2E_52mCHSvI)M29%6u>cObXKGdlf0PyRkq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png.mcmeta b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png.mcmeta new file mode 100644 index 0000000000..5cc283ac57 --- /dev/null +++ b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_basalt.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png new file mode 100644 index 0000000000000000000000000000000000000000..202354ce3c8c0507b0ce56a03ee46b57106519a0 GIT binary patch literal 5499 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 BTvq@9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png.mcmeta b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png.mcmeta new file mode 100644 index 0000000000..5cc283ac57 --- /dev/null +++ b/src/main/resources/assets/spectrum/textures/block/moonstone_engraved_calcite.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/onyx_chiseled_basalt.png b/src/main/resources/assets/spectrum/textures/block/onyx_chiseled_basalt.png index 5bc7898d5dd3d9470068a37776fe4ebc48cc08be..b70748e6989764d8cbf48b57fec0ddcfd4976d04 100644 GIT binary patch delta 1016 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 R(Sra0002ovPDHLkV1nG{%H99~ delta 832 zcmV-G1Hb&b2h0YL8Gi-<000|__{;zR00DDSM?wIu&K&6g00Ra|L_t(YiQSYxOcPNY z$3Il4QSjPp<<5VhrJ9=57$P#bme_&GiI5QEYD{OBh7oHFbEA`kgNeaO6E%_8xEKco z9YnoAX$h!T=v{jP#x_!i$Gu)7=`>O+R94;dM!6A+0fB~ne-@mbXh z>xE^?rYSoD6ei%#P@X$Oc?uJ)qA%WO2`XKDD;ktd6JID8CVuWb0MY3Txp`#QNIXd- zo|I^E^Q}ThqH#gNO=!AKY!Zs2S#t9bn}m`3V#X#RH-9hoyyBjUpAZzh@cuQ12QqD^ zB9GBcMyE5R6OfyLr{gU>(h0~-XD9&ChYh|JjTQx~w$`Tf^)muV$;eYO@_@*t6D=Bk zRmG__=(K8UtQVHibe-XWYqC&m5=Pz#0iTXT(L*7q+?J?)p+K(;N=Cj->FZ~*5)B9; zOGaLb2!GH~`m)-zYHPfH_G;Iw>}un#t4@QU(j|*@%zb>F{uf~j6_YP9ocn-k! zMrCh52x}=E+mc=D-D0|E9NUr&TtAQ^YPycSHM@f%g}pUPIPx&KuJVFR7i={ltE}CRT#&AjcFP3Izy7N*(_O2w}mW?EV6MAid2Xga4+6uVGkk* z9tfqeQto!&C@_P2C;%h+FkM~Yhnq#8i>2bf}- zY_3Q-ANG6uL5157D*C;ghitB>*`G*7#Od~V+;Xsl!Ts$u{c&>z?p&>L=W31SN(g#? zdrh|t5DCO`mB;*gg=!tmn#~o-=8C$SYCQxB^oW@87*Y+9YRJMW?0vXKwGIobaP1p^ zEv!Pd?(YGb{hTR?*vU9ci)lPhjkPc--hI7-=PBlFe-@$uW;}*r2;@_kU$0QkLv;l< zZiIT2^H5!{&;*Q6#kh!oR<@jnFJAL2*>BX?Z`1%kSI+xwWKyO+#;EKMaHZ1a1+lOS z*M9N^+_(XIr&`!^J_rGV69^cq^`Zs|DhYtAb$F>!LmERmj$irICm(%$0vt=Wm2i7q&3Y{S z6;$K)x*90ZBWlKD$k7z`23w;lO7sR>WHavpuz#=#_}aj~_`&HGCPie{p6mwzcB(WI zvM^%y_3(40(J>y5iwL2zRwBuxhj#&(QT_sW^zbfLB8k(!H`xy&v*9J`4YtVUPHPah z;41HIKbTRBDIHW20K2^|Giv;XMgcCQZFY8BJbPyob cf4~p^0po}7%VQP`F8}}l07*qoM6N<$f(z=U0ssI2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/spectrum/textures/block/onyx_engraved_basalt.png.mcmeta b/src/main/resources/assets/spectrum/textures/block/onyx_engraved_basalt.png.mcmeta new file mode 100644 index 0000000000..cde427f717 --- /dev/null +++ b/src/main/resources/assets/spectrum/textures/block/onyx_engraved_basalt.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 35, + "interpolate": true + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/onyx_engraved_calcite.png b/src/main/resources/assets/spectrum/textures/block/onyx_engraved_calcite.png new file mode 100644 index 0000000000000000000000000000000000000000..d786121879a35531982539659394822cd26d96e3 GIT binary patch literal 844 zcmV-S1GD^zP)Px&21!IgR7i>4ls`-pQ5?rVRH#w#+H2*`f1#zCn$#E~GPsu5fys%G5aVi0XP1T% zYYcOvlY@ha!ATP}k=VEx2L&BOy+CORs8{G+djiHbQisRAUL)x4OJ45%e(&!0`+mRg z-M6FkWwqIN^ce2g`0*0}t6Cux49jQFf&Fsds#X9n=HAlLY&M%SPaXrHsE6>YDgbrc z2Eehu%RR^b&f!>}Y*v_Cq|*%+j1{U*1Aw5?1%RgO0F+Hre&p1|JF#;oDVwG!a5&b- zg0aHOM`!tUFG+DU%kV&k7w@wGavhz{u`>O+R9 z4;dM!6A+0fB~ne-@mbXh>xE^?rYSoD6ei%#P@X$Oc?uJ)qA%WO2`XKDD;ktd6JID8 zCVuWb0MY3Txp`#QNIXd-o|I^E^Q}ThqH#gNO=!AKY!Zs2S#t9bn}m`3V#X#RH!t?Q z;+~415EQ)d{xyaNGHs_KkI_v=r!%Azkeh&~<1IbX3CK-nC;-ui4ZanP76q%e)~59J zGXhD;$Wt=%fXJm2EgF7R#i=#uv}$Xt7nadP(Lm{Z#mZ*K9 zK(7o+M!rqy>u0hO4G1AiMqY{t&{6ub+O%qGyngm-*Q@Mmpwk4|LHLqD{6>(H*J2<>GcD*BY=8v zkgvv!SoaQ6*?11X_C{rIKL~3n9NUsz>)m3yXdK&;4O~BvB5Jyhy*0aoB89y*OXT=P z07|PffY8P(?jL^OrLfoV^@RWK2VpI>Bjn&tXQ7A4r2rw~o_?UHA(lQr0KmT~Ccx6? z2PkSt(%97xd_7@V$ljVI68CD*qTpV%vT4#83iPs$I7a^_ZA!aH+`^7+;oszc^Ml_E WjQtOUu~h&70000^l-ULsc;z1Tkp%jHKNe_`1iuvdgliV8R zbwZGx(`4Q}GtcwPbgj#`;*7{kz@VIqpOka6*jH4ueZ@-W#ecg$KNeE}&Q@)9=b9P341Hh?VlH|abIJw-K(yhQNee1yD`7?#34V1*{uiX zqwQ`@4L1tC9zPZ(fpRRzKOY<)rNh2+SAQPAc|YF2l7F9c;(hSD%7lmY*<4U@DD*ks(YG=z z{{B%uJYLKQcEG#?ti}m;O<_Xa;e3`+DoiEj|n`<{$UGYTIB31X4+tBfXD|9SCbw9{>0_& zr(Fug206P5M4ZjEL7~{-qI*I%RUscZcr%}*4?=O=%BWIH)*0rpgL&*wvd%WTBgf|e z+}nG!*1((j0PG*O_}V|EFPmJx=m3ySRa9`H*kCm1Y=0z73`H9=Z6L>R(LLdM!q}#B zccsr4MuP+TvWYkI5vGN>n)DQ309~^b@^y58?vJM|LP^f9GM&4T206RRw~wbA!7<`= z?yAAM?#~AfyE}Cjp^QXa8mOUJgp#C>LWs`*fhW;5i=k+%s#F)^;Qv|Dk2(bFafa0> zXHyl*M@g+)mnUAFo69sBM6|UBrDtKBEiOBzwYyVSi?cM?&?0`PZKulN(pZ Date: Fri, 23 Oct 2026 20:06:36 +0200 Subject: [PATCH 02/16] - Added Chiseled Gemstone Blocks - Added Onyx and Moonstone Chiseled Balcite, matching the CMY variants - What was Onyx and Moonstone Chiseled Balcite is now Onyx and Moonstone Engraved Balcite --- .../blockstates/chiseled_amethyst.json | 7 +++++++ .../blockstates/chiseled_citrine.json | 7 +++++++ .../blockstates/chiseled_moonstone.json | 7 +++++++ .../spectrum/blockstates/chiseled_onyx.json | 7 +++++++ .../spectrum/blockstates/chiseled_topaz.json | 7 +++++++ .../models/block/chiseled_amethyst.json | 6 ++++++ .../models/block/chiseled_citrine.json | 6 ++++++ .../models/block/chiseled_moonstone.json | 6 ++++++ .../spectrum/models/block/chiseled_onyx.json | 6 ++++++ .../spectrum/models/block/chiseled_topaz.json | 6 ++++++ .../models/item/chiseled_amethyst.json | 3 +++ .../models/item/chiseled_citrine.json | 3 +++ .../models/item/chiseled_moonstone.json | 3 +++ .../spectrum/models/item/chiseled_onyx.json | 3 +++ .../spectrum/models/item/chiseled_topaz.json | 3 +++ .../loot_table/blocks/chiseled_amethyst.json | 20 +++++++++++++++++++ .../loot_table/blocks/chiseled_citrine.json | 20 +++++++++++++++++++ .../loot_table/blocks/chiseled_moonstone.json | 20 +++++++++++++++++++ .../loot_table/blocks/chiseled_onyx.json | 20 +++++++++++++++++++ .../loot_table/blocks/chiseled_topaz.json | 20 +++++++++++++++++++ .../tags/block/chiseled_gemstone_blocks.json | 9 +++++++++ .../tags/item/chiseled_gemstone_blocks.json | 9 +++++++++ 22 files changed, 198 insertions(+) create mode 100644 src/main/resources/assets/spectrum/blockstates/chiseled_amethyst.json create mode 100644 src/main/resources/assets/spectrum/blockstates/chiseled_citrine.json create mode 100644 src/main/resources/assets/spectrum/blockstates/chiseled_moonstone.json create mode 100644 src/main/resources/assets/spectrum/blockstates/chiseled_onyx.json create mode 100644 src/main/resources/assets/spectrum/blockstates/chiseled_topaz.json create mode 100644 src/main/resources/assets/spectrum/models/block/chiseled_amethyst.json create mode 100644 src/main/resources/assets/spectrum/models/block/chiseled_citrine.json create mode 100644 src/main/resources/assets/spectrum/models/block/chiseled_moonstone.json create mode 100644 src/main/resources/assets/spectrum/models/block/chiseled_onyx.json create mode 100644 src/main/resources/assets/spectrum/models/block/chiseled_topaz.json create mode 100644 src/main/resources/assets/spectrum/models/item/chiseled_amethyst.json create mode 100644 src/main/resources/assets/spectrum/models/item/chiseled_citrine.json create mode 100644 src/main/resources/assets/spectrum/models/item/chiseled_moonstone.json create mode 100644 src/main/resources/assets/spectrum/models/item/chiseled_onyx.json create mode 100644 src/main/resources/assets/spectrum/models/item/chiseled_topaz.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/chiseled_amethyst.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/chiseled_citrine.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/chiseled_moonstone.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/chiseled_onyx.json create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/chiseled_topaz.json create mode 100644 src/main/resources/data/spectrum/tags/block/chiseled_gemstone_blocks.json create mode 100644 src/main/resources/data/spectrum/tags/item/chiseled_gemstone_blocks.json diff --git a/src/main/resources/assets/spectrum/blockstates/chiseled_amethyst.json b/src/main/resources/assets/spectrum/blockstates/chiseled_amethyst.json new file mode 100644 index 0000000000..33e47c07fd --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/chiseled_amethyst.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/chiseled_amethyst" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/chiseled_citrine.json b/src/main/resources/assets/spectrum/blockstates/chiseled_citrine.json new file mode 100644 index 0000000000..88b1ed825a --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/chiseled_citrine.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/chiseled_citrine" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/chiseled_moonstone.json b/src/main/resources/assets/spectrum/blockstates/chiseled_moonstone.json new file mode 100644 index 0000000000..2f980f38f1 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/chiseled_moonstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/chiseled_moonstone" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/chiseled_onyx.json b/src/main/resources/assets/spectrum/blockstates/chiseled_onyx.json new file mode 100644 index 0000000000..f2a0c9c824 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/chiseled_onyx.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/chiseled_onyx" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/chiseled_topaz.json b/src/main/resources/assets/spectrum/blockstates/chiseled_topaz.json new file mode 100644 index 0000000000..ff9ef4e1e7 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/chiseled_topaz.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/chiseled_topaz" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/chiseled_amethyst.json b/src/main/resources/assets/spectrum/models/block/chiseled_amethyst.json new file mode 100644 index 0000000000..e929a86d2d --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/chiseled_amethyst.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/chiseled_amethyst" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/chiseled_citrine.json b/src/main/resources/assets/spectrum/models/block/chiseled_citrine.json new file mode 100644 index 0000000000..f8188f07d0 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/chiseled_citrine.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/chiseled_citrine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/chiseled_moonstone.json b/src/main/resources/assets/spectrum/models/block/chiseled_moonstone.json new file mode 100644 index 0000000000..405abe0a7f --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/chiseled_moonstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/chiseled_moonstone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/chiseled_onyx.json b/src/main/resources/assets/spectrum/models/block/chiseled_onyx.json new file mode 100644 index 0000000000..f76bd804f1 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/chiseled_onyx.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/chiseled_onyx" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/chiseled_topaz.json b/src/main/resources/assets/spectrum/models/block/chiseled_topaz.json new file mode 100644 index 0000000000..98e100b6b0 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/chiseled_topaz.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "spectrum:block/chiseled_topaz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/chiseled_amethyst.json b/src/main/resources/assets/spectrum/models/item/chiseled_amethyst.json new file mode 100644 index 0000000000..c9ed83503a --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/chiseled_amethyst.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/chiseled_amethyst" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/chiseled_citrine.json b/src/main/resources/assets/spectrum/models/item/chiseled_citrine.json new file mode 100644 index 0000000000..5b401421b5 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/chiseled_citrine.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/chiseled_citrine" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/chiseled_moonstone.json b/src/main/resources/assets/spectrum/models/item/chiseled_moonstone.json new file mode 100644 index 0000000000..8cc38d7294 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/chiseled_moonstone.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/chiseled_moonstone" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/chiseled_onyx.json b/src/main/resources/assets/spectrum/models/item/chiseled_onyx.json new file mode 100644 index 0000000000..a9029ddf67 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/chiseled_onyx.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/chiseled_onyx" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/chiseled_topaz.json b/src/main/resources/assets/spectrum/models/item/chiseled_topaz.json new file mode 100644 index 0000000000..9a33f83194 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/chiseled_topaz.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/chiseled_topaz" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/chiseled_amethyst.json b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_amethyst.json new file mode 100644 index 0000000000..3c25573add --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_amethyst.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:chiseled_amethyst" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/chiseled_citrine.json b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_citrine.json new file mode 100644 index 0000000000..64f5deb12b --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_citrine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:chiseled_citrine" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/chiseled_moonstone.json b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_moonstone.json new file mode 100644 index 0000000000..4706730e14 --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_moonstone.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:chiseled_moonstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/chiseled_onyx.json b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_onyx.json new file mode 100644 index 0000000000..4c5985dcba --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_onyx.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:chiseled_onyx" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/chiseled_topaz.json b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_topaz.json new file mode 100644 index 0000000000..c70053dc7b --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/chiseled_topaz.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:chiseled_topaz" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/block/chiseled_gemstone_blocks.json b/src/main/resources/data/spectrum/tags/block/chiseled_gemstone_blocks.json new file mode 100644 index 0000000000..92010e6abb --- /dev/null +++ b/src/main/resources/data/spectrum/tags/block/chiseled_gemstone_blocks.json @@ -0,0 +1,9 @@ +{ + "values": [ + "spectrum:chiseled_amethyst", + "spectrum:chiseled_citrine", + "spectrum:chiseled_onyx", + "spectrum:chiseled_moonstone", + "spectrum:chiseled_topaz" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/chiseled_gemstone_blocks.json b/src/main/resources/data/spectrum/tags/item/chiseled_gemstone_blocks.json new file mode 100644 index 0000000000..92010e6abb --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/chiseled_gemstone_blocks.json @@ -0,0 +1,9 @@ +{ + "values": [ + "spectrum:chiseled_amethyst", + "spectrum:chiseled_citrine", + "spectrum:chiseled_onyx", + "spectrum:chiseled_moonstone", + "spectrum:chiseled_topaz" + ] +} \ No newline at end of file From c0ca01efd2089bf2873ac965af6726dcab6f8b03 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sat, 24 Oct 2026 11:59:56 +0200 Subject: [PATCH 03/16] update gem chiseled textures --- .../textures/block/chiseled_amethyst.png | Bin 548 -> 561 bytes .../spectrum/textures/block/chiseled_topaz.png | Bin 564 -> 579 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/spectrum/textures/block/chiseled_amethyst.png b/src/main/resources/assets/spectrum/textures/block/chiseled_amethyst.png index 3d13b39855827a1923b5110345743d03a05af882..c2b1f0fcee7da3022abbf4c7df47d50559998bf4 100644 GIT binary patch delta 536 zcmV+z0_Xjt1hE8=B!BoxL_t(|oJ~?ei_=gLo}?)~NK>RCuc73Sx>+iSw;m)OJbTDd z|AXg6{0-v4)1LGyte{{I6))n!P@xB*R1%UlVJRhfAzd~NbxD)9lFkwv9%0^_nQ!L% zX1HH(ue(YWjy}uF@MSQ}JFPw1mY2B!o&Dj_L zCISJ_4xv+gVXnWd&(1H>Brhw}>Rfp(ZCPoD5lxev0{~GV^JF0_ZM~zD2FzesU^g2Cy%MjA0%5yK)eV@^(P{1Rj|W|F z!17m47*V$D6@LKUe>0C2Ls=wVMa7nJ!J$a-S5BJb+UW@Zy#DwDYZ~_S`|nTYY&@C& z6b171QGo~m1qa0Fj|_7*e);SPGM0E1wGJbSp?Xh~l{V`J4E7yH^v#Rs$hc&QIdgA; z0u&rNt$lxFlzJQX6r02&@oJjnwK|6*zn#PJQb@dd(0}IyD;u^`s)WY>gj$_@_w_Tb z1NJ=;$lNOi8b;LeGAv#sG#dnGJQ(Kws(?i5Zoufh!zg3`*x&BbhgUHMEn|wnqCg(V zkNuTn&c>oZaG<5Pa`(#- delta 523 zcmV+m0`&c{1f&FzB!BBkL_t(|oJ~@{tJ6>vK1~xkNK>RCX($;|jZ_e~4pIkahm86^ zI2ZAcaB%9RtI$EgH$+_ALWDO6Q!b-57@?BjR3`dV2JOzLxC4bF^qKbw+aozbC0Innj zpnnXV;Y;QA+h#BvT$WQNDV>2P1nX&@Q9DV=U^v2__GI?+_ZN3QPEsOE%FAc8 zA^^}CRM9{qipl#ouW@2kG?42kCg?SLeNAt3i?D*YSv14Va+dxI37|7{T8E2EoAGT= zW(X3uDjIoK*6KV;e$wImQ>dbGjlN}&P3;q;e2ze_PFNeLE~CFP0sJXlZN`B;_|6qI?Z z_wPO8s&JQYqL}i%`MbFx>FoMX7zVrTKHuGORk&U)Zb-V@?swb$KTggzR_0s|0RR91 N07*qoLE`#A57nuuw^Yl(jKJXJC|oFb{JB z54*V@)cpqqpoYKUY((x-&sdwSpJ z{e3)N?0)ZOzRKa!ne`)z4B8`E73n_fN1infeV5HwxwlW=ZGY$z0LGpqN--yu!j9WB zd;pQamK$|~QiLT{_xRIN-#MKZd_Hja#mhux`0NFM^~!AkeBh)6O<;#X8cLKRV^20) z2b9BEs|_I0w|j>&pZ@u~8hra6ef{WR0g}w_&wdM|O+k?d-=?kHr;q$j9M|7fB5Pz~T4^J)De< z^`1Sj(^Ay6%Cx2vATp;Ab*-Tuj*l{@K*yr4iMnQ|C7!nUuF8@Gqfnt6BO9rVLNN*@ z^tjNCJ<}RJy?+k?j6&s6V5en$hgDlb6lVYcRpjBIiH`72>pSF8Kqvlopa38M2LPUF zp_2yR-Pa!d`MaBZ`C5Gb`TNr4z3M`7c3zyFhi?4q+xHgVog9DY>=9S)-MD!58Y~kc zbYr2n7PHf`c=rjNVDQKWfQ3Jw8B634LXY!IYt@#}Rev)h4+qGm6Mxl~uyQ)_2`m`> zE&Mso2tDp(Y^W@WDwqc@>Xe$G?6jm4-+ulY3&oD@w9K5sGp%}{k~^c}fKjNKvCN|Y zfWP_p4t95U^N{)*#pxuX0e1RtK5j^BV_2%nlGN>6_}WyKtmMx2=?*-2fxouXQe{cB ewC(dh@D(2m4i?Yt=f0000 Date: Sat, 24 Oct 2026 12:58:54 +0200 Subject: [PATCH 04/16] fix enchanter crafting time / xp requirement being switched (made it two years without any report till now, wow!) --- .../dafuqs/spectrum/recipe/enchanter/EnchanterRecipe.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/recipe/enchanter/EnchanterRecipe.java b/src/main/java/de/dafuqs/spectrum/recipe/enchanter/EnchanterRecipe.java index 7c8a212baf..a52f06b531 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/enchanter/EnchanterRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/enchanter/EnchanterRecipe.java @@ -24,8 +24,8 @@ public class EnchanterRecipe extends GatedSpectrumRecipe { protected final List inputs; // first input is the center, all others around clockwise protected final ItemStack output; - protected final int requiredExperience; protected final int craftingTime; + protected final int requiredExperience; protected final boolean noBenefitsFromYieldAndEfficiencyUpgrades; // copy all modified components from the first stack in the ingredients to the output stack protected final boolean copyComponents; @@ -35,8 +35,8 @@ public EnchanterRecipe(String group, Optional requiredAdvancem this.inputs = inputs; this.output = output; - this.requiredExperience = requiredExperience; this.craftingTime = craftingTime; + this.requiredExperience = requiredExperience; this.noBenefitsFromYieldAndEfficiencyUpgrades = noBenefitsFromYieldAndEfficiencyUpgrades; this.copyComponents = copyComponents; @@ -145,8 +145,8 @@ public static class Serializer implements RecipeSerializer { ItemStack.CODEC.listOf().optionalFieldOf("additional_recipe_viewer_results", List.of()).forGetter(recipe -> recipe.additionalResults), Ingredient.CODEC_NONEMPTY.listOf().optionalFieldOf("ingredients", List.of()).forGetter(recipe -> recipe.inputs), ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.output), - Codec.INT.optionalFieldOf("required_experience", 0).forGetter(recipe -> recipe.requiredExperience), Codec.INT.optionalFieldOf("time", 200).forGetter(recipe -> recipe.craftingTime), + Codec.INT.optionalFieldOf("required_experience", 0).forGetter(recipe -> recipe.requiredExperience), Codec.BOOL.optionalFieldOf("disable_yield_and_efficiency_upgrades", false).forGetter(recipe -> recipe.noBenefitsFromYieldAndEfficiencyUpgrades), Codec.BOOL.optionalFieldOf("copy_components", false).forGetter(recipe -> recipe.copyComponents) ).apply(i, EnchanterRecipe::new)); @@ -158,8 +158,8 @@ public static class Serializer implements RecipeSerializer { ItemStack.STREAM_CODEC.apply(ByteBufCodecs.list()), recipe -> recipe.additionalResults, Ingredient.CONTENTS_STREAM_CODEC.apply(ByteBufCodecs.list()), recipe -> recipe.inputs, ItemStack.STREAM_CODEC, recipe -> recipe.output, - ByteBufCodecs.VAR_INT, recipe -> recipe.requiredExperience, ByteBufCodecs.VAR_INT, recipe -> recipe.craftingTime, + ByteBufCodecs.VAR_INT, recipe -> recipe.requiredExperience, ByteBufCodecs.BOOL, recipe -> recipe.noBenefitsFromYieldAndEfficiencyUpgrades, ByteBufCodecs.BOOL, recipe -> recipe.copyComponents, EnchanterRecipe::new From 8b9a2273c1c5ec970443389079c4e038189d4000 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sat, 24 Oct 2026 12:59:06 +0200 Subject: [PATCH 05/16] exempt_from_recipe_debug_check --- .../spectrum/commands/SanityCommand.java | 86 +++++++++++-------- .../spectrum/registries/SpectrumItemTags.java | 1 + 2 files changed, 52 insertions(+), 35 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/commands/SanityCommand.java b/src/main/java/de/dafuqs/spectrum/commands/SanityCommand.java index a817f81ad4..afff52f7ac 100644 --- a/src/main/java/de/dafuqs/spectrum/commands/SanityCommand.java +++ b/src/main/java/de/dafuqs/spectrum/commands/SanityCommand.java @@ -45,7 +45,6 @@ import net.minecraft.world.level.block.state.*; import net.minecraft.world.level.storage.loot.*; import org.apache.commons.lang3.*; -import org.jspecify.annotations.*; import java.util.*; @@ -109,14 +108,18 @@ private static int execute(CommandSourceStack source, String modId) { if (registryKey.location().getNamespace().equals(modId)) { Block block = entry.getValue(); - if (block instanceof PlacedItemBlock) { - continue; // that one always drops itself via code - } - if (block instanceof SpectrumBuddingBlock) { - continue; // does not have any drop by default - } - if (block instanceof WeepingGalaFrondsBlock) { - continue; // Fronds do not drop anything by default + switch (block) { + case PlacedItemBlock ignored -> { + continue; // that one always drops itself via code + } + case SpectrumBuddingBlock ignored -> { + continue; // does not have any drop by default + } + case WeepingGalaFrondsBlock ignored -> { + continue; // Fronds do not drop anything by default + } + default -> { + } } BlockState blockState = entry.getValue().defaultBlockState(); @@ -233,6 +236,36 @@ private static int execute(CommandSourceStack source, String modId) { } } + Set modItems = new HashSet<>(); + + // Items that are meant to be enchantable but not really + for (Map.Entry, Item> item : BuiltInRegistries.ITEM.entrySet()) { + if (!item.getKey().location().getNamespace().equals(modId)) { + continue; + } + + Item i = item.getValue(); + modItems.add(i); + + ItemStack defaultStack = i.getDefaultInstance(); + boolean isEnchantable = i.isEnchantable(defaultStack); + int enchantmentValue = i.getEnchantmentValue(defaultStack); + if(isEnchantable) { + if(enchantmentValue <= 0) { + SpectrumCommon.logWarning("[SANITY: Enchantability] " + item.getValue().getDescriptionId() + " is enchantable, but has an enchantment value of " + enchantmentValue); + } + } + if(enchantmentValue > 0) { + if(!isEnchantable) { + if(i == SpectrumItems.GILDED_BOOK.get()) { + continue; + } + SpectrumCommon.logWarning("[SANITY: Enchantability] " + item.getValue().getDescriptionId() + " is has a positive enchantment value, but its default instance is not enchantable"); + } + } + } + + // recipe groups without localization Set recipeGroups = new HashSet<>(); recipeManager.getRecipeIds().forEach(identifier -> { @@ -245,6 +278,8 @@ private static int execute(CommandSourceStack source, String modId) { } } } + + modItems.remove(recipe.get().value().getResultItem(source.registryAccess()).getItem()); }); for (String recipeGroup : recipeGroups) { if (!Language.getInstance().has("recipeGroup.spectrum." + recipeGroup)) { @@ -269,41 +304,22 @@ private static int execute(CommandSourceStack source, String modId) { testIngredientsAndOutputInColorRegistry(SpectrumRecipeTypes.ENCHANTMENT_UPGRADE, "Enchantment Upgrade", recipeManager, registryManager); testIngredientsAndOutputInColorRegistry(SpectrumRecipeTypes.SPIRIT_INSTILLING, "Spirit Instiller", recipeManager, registryManager); - // Items that are meant to be enchantable but not really - for (Map.Entry, Item> item : BuiltInRegistries.ITEM.entrySet()) { - if (!item.getKey().location().getNamespace().equals(modId)) { - continue; - } - - Item i = item.getValue(); - - ItemStack defaultStack = i.getDefaultInstance(); - boolean isEnchantable = i.isEnchantable(defaultStack); - int enchantmentValue = i.getEnchantmentValue(defaultStack); - if(isEnchantable) { - if(enchantmentValue <= 0) { - SpectrumCommon.logWarning("[SANITY: Enchantability] " + item.getValue().getDescriptionId() + " is enchantable, but has an enchantment value of " + enchantmentValue); - } - } - if(enchantmentValue > 0) { - if(!isEnchantable) { - if(i == SpectrumItems.GILDED_BOOK.get()) { - continue; - } - SpectrumCommon.logWarning("[SANITY: Enchantability] " + item.getValue().getDescriptionId() + " is has a positive enchantment value, but its default instance is not enchantable"); - } + // Items without crafting recipes + for(Item itemWithoutRecipe : modItems) { + if(!itemWithoutRecipe.builtInRegistryHolder().is(SpectrumItemTags.EXEMPT_FROM_RECIPE_DEBUG_CHECK)) { + SpectrumCommon.logWarning("[SANITY: Recipes] " + itemWithoutRecipe.getDescriptionId() + " does not have a recipe"); } } // Impossible to unlock block cloaks for (Map.Entry> cloaks : RevelationRegistry.getBlockStateEntries().entrySet()) { if (advancementLoader.get(cloaks.getKey()) == null) { - SpectrumCommon.logWarning("[SANITY: Block Cloaks] Advancement '" + cloaks.getKey().toString() + "' for block cloaking does not exist. Registered cloaks: " + cloaks.getValue().size()); + SpectrumCommon.logWarning("[SANITY: Block Cloaks] Advancement '" + cloaks.getKey() + "' for block cloaking does not exist. Registered cloaks: " + cloaks.getValue().size()); } } for (Map.Entry> cloaks : RevelationRegistry.getItemEntries().entrySet()) { if (advancementLoader.get(cloaks.getKey()) == null) { - SpectrumCommon.logWarning("[SANITY: Item Cloaks] Advancement '" + cloaks.getKey().toString() + "' for item cloaking does not exist. Registered cloaks: " + cloaks.getValue().size()); + SpectrumCommon.logWarning("[SANITY: Item Cloaks] Advancement '" + cloaks.getKey() + "' for item cloaking does not exist. Registered cloaks: " + cloaks.getValue().size()); } } @@ -466,7 +482,7 @@ private static int execute(CommandSourceStack source, String modId) { for (Map.Entry, Item> item : BuiltInRegistries.ITEM.entrySet()) { if (item.getValue() instanceof SpectrumCurioItem trinketItem) { ResourceLocation advancementIdentifier = trinketItem.getUnlockIdentifier(); - @Nullable AdvancementHolder advancementCriterionAdvancement = advancementLoader.get(advancementIdentifier); + AdvancementHolder advancementCriterionAdvancement = advancementLoader.get(advancementIdentifier); if (advancementCriterionAdvancement == null) { SpectrumCommon.logWarning("[SANITY: Trinkets] Trinket '" + item.getKey().location() + "' references advancement '" + advancementIdentifier + "' that does not exist"); } diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemTags.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemTags.java index f7d5e72735..d77508c414 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemTags.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemTags.java @@ -35,6 +35,7 @@ public class SpectrumItemTags { public static final TagKey TRINKETS = spectrum("trinkets"); public static final TagKey STORES_ITEMS_ADDED_TO_INVENTORY = spectrum("stores_items_added_to_inventory"); // TODO: this might be fun as an item component / enchantment actually public static final TagKey COLORING_BLACKLISTED = spectrum("coloring_blacklisted"); + public static final TagKey EXEMPT_FROM_RECIPE_DEBUG_CHECK = spectrum("exempt_from_recipe_debug_check"); private static TagKey spectrum(String id) { return TagKey.create(Registries.ITEM, SpectrumCommon.locate(id)); From 62139a225c33e3add3c844cfe08fd419fb6c1995 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sat, 24 Oct 2026 12:59:23 +0200 Subject: [PATCH 06/16] lots of new tags / tag fixes --- .../data/c/tags/item/budding_blocks.json | 163 +++++++ src/main/resources/data/c/tags/item/buds.json | 444 ++++++++++++++++++ .../resources/data/c/tags/item/clusters.json | 149 ++++++ .../gem_blocks/chiseled_amethyst.json | 19 + .../gem_blocks/chiseled_citrine.json | 19 + .../gem_blocks/chiseled_moonstone.json | 19 + .../gem_blocks/chiseled_onyx.json | 19 + .../gem_blocks/chiseled_topaz.json | 19 + .../data/spectrum/tags/block/ores.json | 1 + .../spectrum/tags/item/budding_blocks.json | 9 + .../item/crystallarieum_growable_buds.json | 97 ++++ .../crystallarieum_growable_clusters.json | 47 ++ .../item/exempt_from_recipe_debug_check.json | 162 +++++++ .../data/spectrum/tags/item/mob_heads.json | 3 +- .../data/spectrum/tags/item/ores.json | 1 + .../data/spectrum/tags/item/spawn_eggs.json | 10 +- .../item/unbreakable_structure_blocks.json | 43 ++ 17 files changed, 1222 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/data/c/tags/item/budding_blocks.json create mode 100644 src/main/resources/data/c/tags/item/buds.json create mode 100644 src/main/resources/data/c/tags/item/clusters.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_amethyst.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_citrine.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_moonstone.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_onyx.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_topaz.json create mode 100644 src/main/resources/data/spectrum/tags/item/budding_blocks.json create mode 100644 src/main/resources/data/spectrum/tags/item/crystallarieum_growable_buds.json create mode 100644 src/main/resources/data/spectrum/tags/item/crystallarieum_growable_clusters.json create mode 100644 src/main/resources/data/spectrum/tags/item/exempt_from_recipe_debug_check.json create mode 100644 src/main/resources/data/spectrum/tags/item/unbreakable_structure_blocks.json diff --git a/src/main/resources/data/c/tags/item/budding_blocks.json b/src/main/resources/data/c/tags/item/budding_blocks.json new file mode 100644 index 0000000000..82aaf32267 --- /dev/null +++ b/src/main/resources/data/c/tags/item/budding_blocks.json @@ -0,0 +1,163 @@ +{ + "values": [ + "#spectrum:budding_blocks", + + { + "id": "biomemakeover:budding_illunite", + "required": false + }, + + { + "id": "nomansland:budding_quartzite", + "required": false + }, + + { + "id": "geode_plus:budding_basalt_ancient_debris", + "required": false + }, + { + "id": "geode_plus:budding_basalt_glowstone", + "required": false + }, + { + "id": "geode_plus:budding_basalt_gold_nugget", + "required": false + }, + { + "id": "geode_plus:budding_basalt_quartz", + "required": false + }, + { + "id": "geode_plus:budding_blackstone_ancient_debris", + "required": false + }, + { + "id": "geode_plus:budding_blackstone_glowstone", + "required": false + }, + { + "id": "geode_plus:budding_blackstone_gold_nugget", + "required": false + }, + { + "id": "geode_plus:budding_blackstone_quartz", + "required": false + }, + { + "id": "geode_plus:budding_celestite", + "required": false + }, + { + "id": "geode_plus:budding_deepslate_diamond", + "required": false + }, + { + "id": "geode_plus:budding_deepslate_emerald", + "required": false + }, + { + "id": "geode_plus:budding_deepslate_lapis", + "required": false + }, + { + "id": "geode_plus:budding_deepslate_redstone", + "required": false + }, + { + "id": "geode_plus:budding_diamond", + "required": false + }, + { + "id": "geode_plus:budding_echo", + "required": false + }, + { + "id": "geode_plus:budding_emerald", + "required": false + }, + { + "id": "geode_plus:budding_lapis", + "required": false + }, + { + "id": "geode_plus:budding_nether_ancient_debris", + "required": false + }, + { + "id": "geode_plus:budding_nether_glowstone", + "required": false + }, + { + "id": "geode_plus:budding_nether_gold_nugget", + "required": false + }, + { + "id": "geode_plus:budding_nether_quartz", + "required": false + }, + { + "id": "geode_plus:budding_pink_topaz", + "required": false + }, + { + "id": "geode_plus:budding_prismarine", + "required": false + }, + { + "id": "geode_plus:budding_redstone", + "required": false + }, + { + "id": "geode_plus:budding_sculk_diamond", + "required": false + }, + { + "id": "geode_plus:budding_sculk_emerald", + "required": false + }, + { + "id": "geode_plus:budding_sculk_lapis", + "required": false + }, + { + "id": "geode_plus:budding_sculk_redstone", + "required": false + }, + { + "id": "geode_plus:budding_wrappist", + "required": false + }, + + { + "id": "byg:budding_subzero_crystal", + "required": false + }, + { + "id": "byg:budding_therium_crystal", + "required": false + }, + + { + "id": "betterend:budding_smaragdant_crystal", + "required": false + }, + + { + "id": "tconstruct:budding_earth_slime_crystal", + "required": false + }, + { + "id": "tconstruct:budding_sky_slime_crystal", + "required": false + }, + { + "id": "tconstruct:budding_ichor_slime_crystal", + "required": false + }, + { + "id": "tconstruct:budding_ender_slime_crystal", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/buds.json b/src/main/resources/data/c/tags/item/buds.json new file mode 100644 index 0000000000..356082be37 --- /dev/null +++ b/src/main/resources/data/c/tags/item/buds.json @@ -0,0 +1,444 @@ +{ + "values": [ + "#spectrum:gemstone_buds", + "#spectrum:crystallarieum_growable_buds", + + { + "id": "nomansland:small_quartzite_bud", + "required": false + }, + { + "id": "nomansland:medium_quartzite_bud", + "required": false + }, + { + "id": "nomansland:large_quartzite_bud", + "required": false + }, + + { + "id": "biomemakeover:small_illunite_bud", + "required": false + }, + { + "id": "biomemakeover:medium_illunite_bud", + "required": false + }, + { + "id": "biomemakeover:large_illunite_bud", + "required": false + }, + { + "id": "mythicupgrades:small_ametrine_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_ametrine_bud", + "required": false + }, + { + "id": "mythicupgrades:large_ametrine_bud", + "required": false + }, + { + "id": "mythicupgrades:small_aquamarine_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_aquamarine_bud", + "required": false + }, + { + "id": "mythicupgrades:large_aquamarine_bud", + "required": false + }, + { + "id": "mythicupgrades:small_jade_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_jade_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:large_jade_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:small_ruby_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_ruby_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:large_ruby_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:small_sapphire_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_sapphire_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:large_sapphire_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:small_topaz_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:medium_topaz_crystal_bud", + "required": false + }, + { + "id": "mythicupgrades:large_topaz_crystal_bud", + "required": false + }, + + { + "id": "geode_plus:small_celestite_bud", + "required": false + }, + { + "id": "geode_plus:small_diamond_bud", + "required": false + }, + { + "id": "geode_plus:small_echo_bud", + "required": false + }, + { + "id": "geode_plus:small_emerald_bud", + "required": false + }, + { + "id": "geode_plus:small_lapis_bud", + "required": false + }, + { + "id": "geode_plus:small_nether_ancient_debris_bud", + "required": false + }, + { + "id": "geode_plus:small_nether_glowstone_bud", + "required": false + }, + { + "id": "geode_plus:small_nether_gold_nugget_bud", + "required": false + }, + { + "id": "geode_plus:small_nether_quartz_bud", + "required": false + }, + { + "id": "geode_plus:small_pink_topaz_bud", + "required": false + }, + { + "id": "geode_plus:small_prismarine_bud", + "required": false + }, + { + "id": "geode_plus:small_redstone_bud", + "required": false + }, + { + "id": "geode_plus:small_wrappist_bud", + "required": false + }, + { + "id": "geode_plus:celestite_cluster", + "required": false + }, + { + "id": "geode_plus:prismarine_cluster", + "required": false + }, + { + "id": "geode_plus:lapis_cluster", + "required": false + }, + { + "id": "geode_plus:emerald_cluster", + "required": false + }, + { + "id": "geode_plus:nether_gold_nugget_cluster", + "required": false + }, + { + "id": "geode_plus:nether_glowstone_cluster", + "required": false + }, + { + "id": "geode_plus:nether_ancient_debris_cluster", + "required": false + }, + { + "id": "geode_plus:wrappist_cluster", + "required": false + }, + { + "id": "geode_plus:echo_crystal", + "required": false + }, + { + "id": "geode_plus:diamond_crystal", + "required": false + }, + { + "id": "geode_plus:redstone_crystal", + "required": false + }, + { + "id": "geode_plus:nether_quartz_crystal", + "required": false + }, + { + "id": "geode_plus:large_celestite_bud", + "required": false + }, + { + "id": "geode_plus:large_diamond_bud", + "required": false + }, + { + "id": "geode_plus:large_echo_bud", + "required": false + }, + { + "id": "geode_plus:large_emerald_bud", + "required": false + }, + { + "id": "geode_plus:large_lapis_bud", + "required": false + }, + { + "id": "geode_plus:large_nether_ancient_debris_bud", + "required": false + }, + { + "id": "geode_plus:large_nether_glowstone_bud", + "required": false + }, + { + "id": "geode_plus:large_nether_gold_nugget_bud", + "required": false + }, + { + "id": "geode_plus:large_nether_quartz_bud", + "required": false + }, + { + "id": "geode_plus:large_pink_topaz_bud", + "required": false + }, + { + "id": "geode_plus:large_prismarine_bud", + "required": false + }, + { + "id": "geode_plus:large_redstone_bud", + "required": false + }, + { + "id": "geode_plus:large_wrappist_bud", + "required": false + }, + { + "id": "geode_plus:medium_celestite_bud", + "required": false + }, + { + "id": "geode_plus:medium_diamond_bud", + "required": false + }, + { + "id": "geode_plus:medium_echo_bud", + "required": false + }, + { + "id": "geode_plus:medium_emerald_bud", + "required": false + }, + { + "id": "geode_plus:medium_lapis_bud", + "required": false + }, + { + "id": "geode_plus:medium_nether_ancient_debris_bud", + "required": false + }, + { + "id": "geode_plus:medium_nether_glowstone_bud", + "required": false + }, + { + "id": "geode_plus:medium_nether_gold_nugget_bud", + "required": false + }, + { + "id": "geode_plus:medium_nether_quartz_bud", + "required": false + }, + { + "id": "geode_plus:medium_pink_topaz_bud", + "required": false + }, + { + "id": "geode_plus:medium_prismarine_bud", + "required": false + }, + { + "id": "geode_plus:medium_redstone_bud", + "required": false + }, + { + "id": "geode_plus:medium_wrappist_bud", + "required": false + }, + + { + "id": "geodes:small_emerald_bud", + "required": false + }, + { + "id": "geodes:small_quartz_bud", + "required": false + }, + { + "id": "geodes:small_echo_bud", + "required": false + }, + { + "id": "geodes:small_lapis_bud", + "required": false + }, + { + "id": "geodes:small_gypsum_rose", + "required": false + }, + { + "id": "geodes:medium_emerald_bud", + "required": false + }, + { + "id": "geodes:medium_quartz_bud", + "required": false + }, + { + "id": "geodes:medium_echo_bud", + "required": false + }, + { + "id": "geodes:medium_lapis_bud", + "required": false + }, + { + "id": "geodes:medium_gypsum_rose", + "required": false + }, + { + "id": "geodes:large_emerald_bud", + "required": false + }, + { + "id": "geodes:large_quartz_bud", + "required": false + }, + { + "id": "geodes:large_echo_bud", + "required": false + }, + { + "id": "geodes:large_lapis_bud", + "required": false + }, + { + "id": "geodes:large_gypsum_rose", + "required": false + }, + + { + "id": "byg:large_subzero_crystal_bud", + "required": false + }, + { + "id": "byg:medium_subzero_crystal_bud", + "required": false + }, + { + "id": "byg:small_subzero_crystal_bud", + "required": false + }, + { + "id": "byg:large_therium_crystal_bud", + "required": false + }, + { + "id": "byg:medium_therium_crystal_bud", + "required": false + }, + { + "id": "byg:small_therium_crystal_bud", + "required": false + }, + + { + "id": "tconstruct:small_earth_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:small_sky_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:small_ichor_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:small_ender_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:medium_earth_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:medium_sky_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:medium_ichor_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:medium_ender_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:large_earth_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:large_sky_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:large_ichor_slime_crystal_bud", + "required": false + }, + { + "id": "tconstruct:large_ender_slime_crystal_bud", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/c/tags/item/clusters.json b/src/main/resources/data/c/tags/item/clusters.json new file mode 100644 index 0000000000..6059ec7a07 --- /dev/null +++ b/src/main/resources/data/c/tags/item/clusters.json @@ -0,0 +1,149 @@ +{ + "values": [ + "#spectrum:gemstone_clusters", + "#spectrum:crystallarieum_growable_clusters", + + { + "id": "biomemakeover:illunite_cluster", + "required": false + }, + + { + "id": "nomansland:quartzite_cluster", + "required": false + }, + + { + "id": "mythicupgrades:ametrine_cluster", + "required": false + }, + { + "id": "mythicupgrades:aquamarine_cluster", + "required": false + }, + { + "id": "mythicupgrades:jade_crystal_cluster", + "required": false + }, + { + "id": "mythicupgrades:ruby_crystal_cluster", + "required": false + }, + { + "id": "mythicupgrades:sapphire_crystal_cluster", + "required": false + }, + { + "id": "mythicupgrades:topaz_crystal_cluster", + "required": false + }, + + { + "id": "geode_plus:celestite_cluster", + "required": false + }, + { + "id": "geode_plus:diamond_crystal", + "required": false + }, + { + "id": "geode_plus:echo_crystal", + "required": false + }, + { + "id": "geode_plus:emerald_cluster", + "required": false + }, + { + "id": "geode_plus:lapis_cluster", + "required": false + }, + { + "id": "geode_plus:nether_ancient_debris_cluster", + "required": false + }, + { + "id": "geode_plus:nether_glowstone_cluster", + "required": false + }, + { + "id": "geode_plus:nether_gold_nugget_cluster", + "required": false + }, + { + "id": "geode_plus:nether_quartz_crystal", + "required": false + }, + { + "id": "geode_plus:pink_topaz_crystal", + "required": false + }, + { + "id": "geode_plus:prismarine_cluster", + "required": false + }, + { + "id": "geode_plus:redstone_crystal", + "required": false + }, + { + "id": "geode_plus:wrappist_cluster", + "required": false + }, + + { + "id": "geodes:emerald_cluster", + "required": false + }, + { + "id": "geodes:quartz_cluster", + "required": false + }, + { + "id": "geodes:diamond_cluster", + "required": false + }, + { + "id": "geodes:echo_cluster", + "required": false + }, + { + "id": "geodes:lapis_cluster", + "required": false + }, + { + "id": "geodes:gypsum_rose", + "required": false + }, + + { + "id": "byg:subzero_crystal_cluster", + "required": false + }, + { + "id": "byg:therium_crystal_cluster", + "required": false + }, + { + "id": "byg:ametrine_cluster", + "required": false + }, + + { + "id": "tconstruct:earth_slime_crystal_cluster", + "required": false + }, + { + "id": "tconstruct:sky_slime_crystal_cluster", + "required": false + }, + { + "id": "tconstruct:ichor_slime_crystal_cluster", + "required": false + }, + { + "id": "tconstruct:ender_slime_crystal_cluster", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_amethyst.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_amethyst.json new file mode 100644 index 0000000000..e8bf14c278 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_amethyst.json @@ -0,0 +1,19 @@ +{ + "type": "spectrum:gated_crafting_shaped", + "required_advancement": "spectrum:hidden/collect_shards/amethyst", + "pattern": [ + "WW", + "WW" + ], + "key": { + "W": [ + { + "item": "spectrum:polished_amethyst" + } + ] + }, + "result": { + "id": "spectrum:chiseled_amethyst", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_citrine.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_citrine.json new file mode 100644 index 0000000000..4ff05a7ed2 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_citrine.json @@ -0,0 +1,19 @@ +{ + "type": "spectrum:gated_crafting_shaped", + "required_advancement": "spectrum:hidden/collect_shards/citrine", + "pattern": [ + "WW", + "WW" + ], + "key": { + "W": [ + { + "item": "spectrum:polished_citrine" + } + ] + }, + "result": { + "id": "spectrum:chiseled_citrine", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_moonstone.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_moonstone.json new file mode 100644 index 0000000000..fabcfda776 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_moonstone.json @@ -0,0 +1,19 @@ +{ + "type": "spectrum:gated_crafting_shaped", + "required_advancement": "spectrum:lategame/collect_moonstone", + "pattern": [ + "WW", + "WW" + ], + "key": { + "W": [ + { + "item": "spectrum:polished_moonstone" + } + ] + }, + "result": { + "id": "spectrum:chiseled_moonstone", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_onyx.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_onyx.json new file mode 100644 index 0000000000..27f5ac115f --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_onyx.json @@ -0,0 +1,19 @@ +{ + "type": "spectrum:gated_crafting_shaped", + "required_advancement": "spectrum:create_onyx_shard", + "pattern": [ + "WW", + "WW" + ], + "key": { + "W": [ + { + "item": "spectrum:polished_onyx" + } + ] + }, + "result": { + "id": "spectrum:chiseled_onyx", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_topaz.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_topaz.json new file mode 100644 index 0000000000..0f32e35634 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/chiseled_topaz.json @@ -0,0 +1,19 @@ +{ + "type": "spectrum:gated_crafting_shaped", + "required_advancement": "spectrum:hidden/collect_shards/topaz", + "pattern": [ + "WW", + "WW" + ], + "key": { + "W": [ + { + "item": "spectrum:polished_topaz" + } + ] + }, + "result": { + "id": "spectrum:chiseled_topaz", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/block/ores.json b/src/main/resources/data/spectrum/tags/block/ores.json index 4d007dd4e1..7ad9f76051 100644 --- a/src/main/resources/data/spectrum/tags/block/ores.json +++ b/src/main/resources/data/spectrum/tags/block/ores.json @@ -1,5 +1,6 @@ { "values": [ + "#spectrum:blackslag_ores", "#spectrum:gemstone_ores", "#spectrum:azurite_ores", "#spectrum:shimmerstone_ores", diff --git a/src/main/resources/data/spectrum/tags/item/budding_blocks.json b/src/main/resources/data/spectrum/tags/item/budding_blocks.json new file mode 100644 index 0000000000..911e2a8e51 --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/budding_blocks.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:budding_amethyst", + "spectrum:budding_citrine", + "spectrum:budding_onyx", + "spectrum:budding_moonstone", + "spectrum:budding_topaz" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_buds.json b/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_buds.json new file mode 100644 index 0000000000..de9919923c --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_buds.json @@ -0,0 +1,97 @@ +{ + "values": [ + "spectrum:small_malachite_bud", + "spectrum:large_malachite_bud", + "spectrum:small_bismuth_bud", + "spectrum:large_bismuth_bud", + "spectrum:small_azurite_bud", + "spectrum:large_azurite_bud", + "spectrum:small_bloodstone_bud", + "spectrum:large_bloodstone_bud", + + "spectrum:small_coal_bud", + "spectrum:large_coal_bud", + "spectrum:small_copper_bud", + "spectrum:large_copper_bud", + "spectrum:small_diamond_bud", + "spectrum:large_diamond_bud", + "spectrum:small_emerald_bud", + "spectrum:large_emerald_bud", + "spectrum:small_glowstone_bud", + "spectrum:large_glowstone_bud", + "spectrum:small_gold_bud", + "spectrum:large_gold_bud", + "spectrum:small_iron_bud", + "spectrum:large_iron_bud", + "spectrum:small_lapis_bud", + "spectrum:large_lapis_bud", + "spectrum:small_netherite_scrap_bud", + "spectrum:large_netherite_scrap_bud", + "spectrum:small_echo_bud", + "spectrum:large_echo_bud", + "spectrum:small_prismarine_bud", + "spectrum:large_prismarine_bud", + "spectrum:small_quartz_bud", + "spectrum:large_quartz_bud", + "spectrum:small_redstone_bud", + "spectrum:large_redstone_bud", + + { + "id": "spectrum:small_zinc_bud", + "required": false + }, + { + "id": "spectrum:large_zinc_bud", + "required": false + }, + { + "id": "spectrum:small_zinc_bud", + "required": false + }, + { + "id": "spectrum:large_zinc_bud", + "required": false + }, + { + "id": "spectrum:small_certus_quartz_bud", + "required": false + }, + { + "id": "spectrum:large_certus_quartz_bud", + "required": false + }, + { + "id": "spectrum:small_fluix_bud", + "required": false + }, + { + "id": "spectrum:large_fluix_bud", + "required": false + }, + + { + "id": "spectrum:small_globette_bud", + "required": false + }, + { + "id": "spectrum:large_globette_bud", + "required": false + }, + { + "id": "spectrum:small_globette_end_bud", + "required": false + }, + { + "id": "spectrum:large_globette_end_bud", + "required": false + }, + { + "id": "spectrum:small_globette_nether_bud", + "required": false + }, + { + "id": "spectrum:large_globette_nether_bud", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_clusters.json b/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_clusters.json new file mode 100644 index 0000000000..66764e8f0d --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/crystallarieum_growable_clusters.json @@ -0,0 +1,47 @@ +{ + "values": [ + "spectrum:malachite_cluster", + "spectrum:bismuth_cluster", + "spectrum:azurite_cluster", + "spectrum:bloodstone_cluster", + + "spectrum:coal_cluster", + "spectrum:copper_cluster", + "spectrum:diamond_cluster", + "spectrum:emerald_cluster", + "spectrum:glowstone_cluster", + "spectrum:gold_cluster", + "spectrum:iron_cluster", + "spectrum:lapis_cluster", + "spectrum:netherite_scrap_cluster", + "spectrum:echo_cluster", + "spectrum:prismarine_cluster", + "spectrum:quartz_cluster", + "spectrum:redstone_cluster", + + { + "id": "spectrum:zinc_cluster", + "required": false + }, + { + "id": "spectrum:certus_quartz_cluster", + "required": false + }, + { + "id": "spectrum:fluix_cluster", + "required": false + }, + { + "id": "spectrum:globette_cluster", + "required": false + }, + { + "id": "spectrum:globette_end_cluster", + "required": false + }, + { + "id": "spectrum:globette_nether_cluster", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/exempt_from_recipe_debug_check.json b/src/main/resources/data/spectrum/tags/item/exempt_from_recipe_debug_check.json new file mode 100644 index 0000000000..77aa94dca1 --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/exempt_from_recipe_debug_check.json @@ -0,0 +1,162 @@ +{ + "values": [ + "#spectrum:mob_heads", + "#c:buds", + "#c:clusters", + "#c:budding_blocks", + "#spectrum:colored_spore_blossoms", + "#spectrum:colored_grass_blocks", + "#spectrum:colored_short_grass", + "#spectrum:colored_tall_grass", + "#spectrum:rock_candy", + "#spectrum:colored_logs", + "#spectrum:colored_leaves", + "#spectrum:ores", + "#spectrum:unbreakable_structure_blocks", + "#spectrum:spawn_eggs", + "#spectrum:shooting_stars", + "#spectrum:noxcap_stems", + "#spectrum:noxcap_gills", + "#spectrum:noxcap_blocks", + "#spectrum:dragonjags", + "#spectrum:star_candies", + "#c:music_discs", + + "spectrum:sugar_stick", + "spectrum:topaz_sugar_stick", + "spectrum:amethyst_sugar_stick", + "spectrum:citrine_sugar_stick", + "spectrum:onyx_sugar_stick", + "spectrum:moonstone_sugar_stick", + + "spectrum:rock_candy", + "spectrum:topaz_rock_candy", + "spectrum:amethyst_rock_candy", + "spectrum:citrine_rock_candy", + "spectrum:onyx_rock_candy", + "spectrum:moonstone_rock_candy", + + "spectrum:pedestal_tier_1_structure_placer", + "spectrum:pedestal_tier_2_structure_placer", + "spectrum:pedestal_tier_3_structure_placer", + "spectrum:fusion_shrine_structure_placer", + "spectrum:enchanter_structure_placer", + "spectrum:spirit_instiller_structure_placer", + "spectrum:cinderhearth_structure_placer", + + "spectrum:moonstone_core", + "spectrum:ebony_noxshroom", + "spectrum:hibernating_jade_vine_bulb", + "spectrum:nephrite_blossom_stem", + "spectrum:giant_moss_ball", + "spectrum:spectral_shard", + "spectrum:weeping_gala_log", + "#spectrum:cookbooks", + "spectrum:bottle_of_forfeiture", + "spectrum:small_yellow_dragonjag", + "spectrum:stripped_weeping_gala_log", + "spectrum:jadeite_lotus_stem", + "spectrum:astrologer_banner_pattern", + "spectrum:divination_heart", + "spectrum:black_materia", + "spectrum:downstone_fragments", + "spectrum:suspicious_black_sludge", + "spectrum:lizard_meat", + "spectrum:bristle_sprouts", + "spectrum:doombloom_seed", + "spectrum:glass_peach", + "spectrum:downstone", + "spectrum:clover", + "spectrum:basal_marble", + "spectrum:vintage_color_picker", + "spectrum:blazing_crystal", + "spectrum:jadeite_lotus_flower", + "spectrum:sawblade_holly_berry", + "spectrum:velvet_astrologer_banner_pattern", + "spectrum:shale_clay", + "spectrum:snapping_ivy", + "spectrum:chestnut_noxshroom", + "spectrum:waxed_hummingstone", + "spectrum:gilded_book", + "spectrum:sacred_soil", + "spectrum:creative_ink_assortment", + "spectrum:blood_orchid_petal", + "spectrum:weeping_gala_sprig", + "spectrum:poisonbloom_banner_pattern", + "spectrum:tilled_shale_clay", + "spectrum:spirit_sallow_heart", + "spectrum:creative_particle_spawner", + "spectrum:quitoxic_reeds", + "spectrum:moss_ball", + "spectrum:infested_blackslag", + "spectrum:frostbite_crystal", + "spectrum:dragonbone_chunk", + "spectrum:spirit_sallow_roots", + "spectrum:jade_jelly", + "spectrum:jadeite_lotus_bulb", + "spectrum:bright_twill", + "spectrum:rock_crystal", + "spectrum:nephrite_blossom_leaves", + "spectrum:silver_scale", + "spectrum:myceylon", + "spectrum:primordial_lighter", + "spectrum:aloe_leaf", + "spectrum:weeping_gala_leaves", + "spectrum:milky_resin", + "spectrum:ashen_blackslag", + "spectrum:splinterspawn_infested_shale_clay", + "spectrum:pyrite_ripper", + "spectrum:bucket_of_koi", + + "spectrum:sweet_pea", + "spectrum:apricotti", + "spectrum:humming_bell", + + "spectrum:stripped_weeping_gala_wood", + "spectrum:suspicious_ash", + "spectrum:ancient_chiseled_polished_blackslag", + "spectrum:deep_light_banner_pattern", + "spectrum:amaranth_bushel", + "spectrum:nephrite_blossom_bulb", + "spectrum:chrysocolla", + "spectrum:black_sludge", + "spectrum:spirit_sallow_log", + "spectrum:mysterious_compass", + "spectrum:invisible_wall", + "spectrum:radiating_ender", + "spectrum:wet_lava_sponge", + "spectrum:koi", + "spectrum:cracked_dragonbone", + "spectrum:sawblade_grass", + "spectrum:crawfish", + "spectrum:shimmel", + "spectrum:jade_twill", + "spectrum:resonance_shard", + "spectrum:hummingstone_glass", + "spectrum:suspicious_rotten_ground", + "spectrum:rotten_ground", + "spectrum:hover_block", + "spectrum:overgrown_slush", + "spectrum:tilled_slush", + "spectrum:hummingstone", + "spectrum:mermaids_jam", + "spectrum:varia_sprout", + "spectrum:aether_graced_nectar_gloves", + "spectrum:dragon_talon", + "spectrum:splinterspawn_infested_pyrite", + "spectrum:overgrown_blackslag", + "spectrum:mermaids_gem", + "spectrum:logo_banner_pattern", + "spectrum:dragonbone", + "spectrum:pyrite_chunk", + "spectrum:suspicious_slush", + "spectrum:slush", + "spectrum:cracked_end_portal_frame", + "spectrum:artists_palette", + "spectrum:bucket_of_eraser", + "spectrum:spirit_sallow_leaves", + "spectrum:longing_chimera", + "spectrum:slate_noxshroom", + "spectrum:ivory_noxshroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/mob_heads.json b/src/main/resources/data/spectrum/tags/item/mob_heads.json index 9d1b20dbfa..a5566ed3e2 100644 --- a/src/main/resources/data/spectrum/tags/item/mob_heads.json +++ b/src/main/resources/data/spectrum/tags/item/mob_heads.json @@ -125,6 +125,7 @@ "spectrum:marrow_head", "spectrum:splinterspawn_head", "spectrum:koi_head", - "spectrum:crawfish_head" + "spectrum:crawfish_head", + "spectrum:piglin_brute_head" ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/ores.json b/src/main/resources/data/spectrum/tags/item/ores.json index 2b9b71f447..6f244ae88c 100644 --- a/src/main/resources/data/spectrum/tags/item/ores.json +++ b/src/main/resources/data/spectrum/tags/item/ores.json @@ -1,5 +1,6 @@ { "values": [ + "#spectrum:blackslag_ores", "#spectrum:gemstone_ores", "#spectrum:azurite_ores", "#spectrum:shimmerstone_ores", diff --git a/src/main/resources/data/spectrum/tags/item/spawn_eggs.json b/src/main/resources/data/spectrum/tags/item/spawn_eggs.json index e279c97b22..085d003ca4 100644 --- a/src/main/resources/data/spectrum/tags/item/spawn_eggs.json +++ b/src/main/resources/data/spectrum/tags/item/spawn_eggs.json @@ -65,7 +65,15 @@ "minecraft:zombie_horse_spawn_egg", "minecraft:zombie_villager_spawn_egg", "minecraft:zombified_piglin_spawn_egg", + "spectrum:koi_spawn_egg", - "spectrum:crawfish_spawn_egg" + "spectrum:crawfish_spawn_egg", + "spectrum:kindling_spawn_egg", + "spectrum:egg_laying_wooly_pig_spawn_egg", + "spectrum:preservation_turret_spawn_egg", + "spectrum:lizard_spawn_egg", + "spectrum:eraser_spawn_egg", + "spectrum:marrow_spawn_egg", + "spectrum:splinterspawn_spawn_egg" ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/item/unbreakable_structure_blocks.json b/src/main/resources/data/spectrum/tags/item/unbreakable_structure_blocks.json new file mode 100644 index 0000000000..0f7ee14542 --- /dev/null +++ b/src/main/resources/data/spectrum/tags/item/unbreakable_structure_blocks.json @@ -0,0 +1,43 @@ +{ + "values": [ + "spectrum:preservation_controller", + "spectrum:preservation_stone", + "spectrum:preservation_bricks", + "spectrum:preservation_stairs", + "spectrum:preservation_wall", + "spectrum:preservation_slab", + + "spectrum:shimmering_preservation_bricks", + "spectrum:powder_chiseled_preservation_stone", + "spectrum:dike_chiseled_preservation_stone", + "spectrum:dream_chiseled_preservation_stone", + "spectrum:deep_light_chiseled_preservation_stone", + "spectrum:preservation_glass", + "spectrum:tinted_preservation_glass", + "spectrum:dike_gate", + "spectrum:dream_gate", + "spectrum:courier_statue", + "spectrum:preservation_chest", + "spectrum:dike_gate_fountain", + "spectrum:preservation_roundel", + "spectrum:preservation_sensor", + "spectrum:preservation_block_detector", + "spectrum:preservation_item_bowl", + "spectrum:black_chiseled_preservation_stone", + "spectrum:blue_chiseled_preservation_stone", + "spectrum:brown_chiseled_preservation_stone", + "spectrum:cyan_chiseled_preservation_stone", + "spectrum:gray_chiseled_preservation_stone", + "spectrum:green_chiseled_preservation_stone", + "spectrum:light_blue_chiseled_preservation_stone", + "spectrum:light_gray_chiseled_preservation_stone", + "spectrum:lime_chiseled_preservation_stone", + "spectrum:magenta_chiseled_preservation_stone", + "spectrum:orange_chiseled_preservation_stone", + "spectrum:pink_chiseled_preservation_stone", + "spectrum:purple_chiseled_preservation_stone", + "spectrum:red_chiseled_preservation_stone", + "spectrum:white_chiseled_preservation_stone", + "spectrum:yellow_chiseled_preservation_stone" + ] +} \ No newline at end of file From 6a67ee9851e6fd64aabbf325eb6fbbe1bce884c8 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sat, 24 Oct 2026 12:59:32 +0200 Subject: [PATCH 07/16] update guidebook recipe ids --- .../modonomicon/books/guidebook/entries/ink/daydreamer.json | 2 +- .../modonomicon/books/guidebook/entries/ink/vantaclast.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/daydreamer.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/daydreamer.json index 04cc1f8728..af154f29a2 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/daydreamer.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/daydreamer.json @@ -23,7 +23,7 @@ { "type": "spectrum:pedestal_crafting", "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier2/daydreamer", + "recipe_id": "spectrum:pedestal/tier4/daydreamer", "text": "book.spectrum.guidebook.daydreamer.recipe.text" } ] diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/vantaclast.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/vantaclast.json index 0799bd7998..1d1cfb2623 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/vantaclast.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/ink/vantaclast.json @@ -23,7 +23,7 @@ { "type": "spectrum:pedestal_crafting", "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier2/vantaclast", + "recipe_id": "spectrum:pedestal/tier3/vantaclast", "text": "book.spectrum.guidebook.vantaclast.recipe.text" } ] From 4047bf17d0e735fa56e4e7a06d7d7bbe61fa5d1f Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 15:33:39 +0100 Subject: [PATCH 08/16] bump modonomicon version to 1.120.7 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bd45cd4786..2952df796d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ rei_version=16.0.799 emi_version=1.1.24+1.21.1 architectury_version=13.0.8 # https://cloudsmith.io/~klikli-dev/repos/mods/groups/ -modonomicon_version=1.120.4 +modonomicon_version=1.120.7 modonomicon_version_range=[1.117.4,) # https://maven.is-immensely.gay/#/releases/de/dafuqs/additionalentityattributes additional_entity_attributes_version=2.0.2+1.21.1-neoforge From 93e4a1f73fcb7ce47b1c1711a6fcd73072c9c047 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 16:28:50 +0100 Subject: [PATCH 09/16] don't mark azurite clusters and buds as uncommon, matching azurite in general --- .../java/de/dafuqs/spectrum/registries/SpectrumBlocks.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index e265b892ab..f93b376630 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -1231,9 +1231,9 @@ private static BlockBehaviour.Properties endstoneOre() { public static final DeferredBlock DEEPSLATE_AZURITE_ORE = register(simpleMirrored(blockWithItem("deepslate_azurite_ore", () -> new AzuriteOreBlock(UniformInt.of(4, 7), deepslateOre().randomTicks(), SpectrumAdvancements.REVEAL_AZURITE, Blocks.DEEPSLATE.defaultBlockState())))); public static final DeferredBlock BLACKSLAG_AZURITE_ORE = register(simpleMirrored(blockWithItem("blackslag_azurite_ore", () -> new AzuriteOreBlock(UniformInt.of(4, 7), blackslagOre().randomTicks(), SpectrumAdvancements.REVEAL_AZURITE, BLACKSLAG.get().defaultBlockState())))); public static final DeferredBlock PURE_AZURITE_BLOCK = register(defaultUpFacing(blockWithItem("pure_azurite_block", () -> new SpectrumDirectionalBlock(BlockBehaviour.Properties.ofFullCopy(LAPIS_BLOCK).mapColor(MapColor.COLOR_BLUE))), TexturedModel.CUBE_TOP_BOTTOM)); - public static final DeferredBlock AZURITE_CLUSTER = register(cluster(blockWithItem("azurite_cluster", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.SMALL_ONYX_BUD, 2), SpectrumClusterBlock.GrowthStage.CLUSTER), () -> IS.of(Rarity.UNCOMMON)), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); - public static final DeferredBlock LARGE_AZURITE_BUD = register(cluster(blockWithItem("large_azurite_bud", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.LARGE_ONYX_BUD, 3), SpectrumClusterBlock.GrowthStage.LARGE), () -> IS.of(Rarity.UNCOMMON)), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); - public static final DeferredBlock SMALL_AZURITE_BUD = register(cluster(blockWithItem("small_azurite_bud", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.ONYX_CLUSTER, 5), SpectrumClusterBlock.GrowthStage.SMALL), () -> IS.of(Rarity.UNCOMMON)), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); + public static final DeferredBlock AZURITE_CLUSTER = register(cluster(blockWithItem("azurite_cluster", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.SMALL_ONYX_BUD, 2), SpectrumClusterBlock.GrowthStage.CLUSTER), () -> IS.of()), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); + public static final DeferredBlock LARGE_AZURITE_BUD = register(cluster(blockWithItem("large_azurite_bud", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.LARGE_ONYX_BUD, 3), SpectrumClusterBlock.GrowthStage.LARGE), () -> IS.of()), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); + public static final DeferredBlock SMALL_AZURITE_BUD = register(cluster(blockWithItem("small_azurite_bud", () -> new SpectrumClusterBlock(gemstone(MapColor.COLOR_BLUE, SpectrumSoundTypes.ONYX_CLUSTER, 5), SpectrumClusterBlock.GrowthStage.SMALL), () -> IS.of()), SpectrumModelTemplates.CRYSTALLARIEUM_FARMABLE)); public static final DeferredBlock MALACHITE_ORE = register(simple(blockWithItem("malachite_ore", () -> new CloakedOreBlock(UniformInt.of(7, 11), ore(), SpectrumAdvancements.REVEAL_MALACHITE, STONE.defaultBlockState()), () -> IS.of(Rarity.UNCOMMON)))); public static final DeferredBlock RAW_MALACHITE_BLOCK = register(simple(blockWithItem("raw_malachite_block", () -> new Block(ore().mapColor(MapColor.EMERALD))))); From b73fb585dcefc7ddf2b2d1f498a762b2f56fda9d Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 16:29:34 +0100 Subject: [PATCH 10/16] gemstone brick recipes do not require the pedestal anymore - now work in crafting tables --- .../gem_blocks/amethyst_bricks.json} | 12 ++++---- .../gem_blocks/azurite_bricks.json} | 12 ++++---- .../gem_blocks/bloodstone_bricks.json} | 12 ++++---- .../gem_blocks/citrine_bricks.json} | 12 ++++---- .../gem_blocks/malachite_bricks.json} | 12 ++++---- .../gem_blocks/mixed_gemstone_bricks.json | 30 +++++++++++++++++++ .../mixed_refined_crystal_bricks.json | 20 +++++++++++++ .../gem_blocks/moonstone_bricks.json} | 12 ++++---- .../gem_blocks/onyx_bricks.json} | 12 ++++---- .../gem_blocks/topaz_bricks.json} | 12 ++++---- .../tier1/bricks/mixed_gemstone_bricks.json | 20 ------------- .../bricks/mixed_refined_crystal_bricks.json | 18 ----------- .../recipe/stonecutting/bricks/amethyst.json | 12 -------- .../recipe/stonecutting/bricks/azurite.json | 12 -------- .../stonecutting/bricks/bloodstone.json | 12 -------- .../recipe/stonecutting/bricks/citrine.json | 12 -------- .../recipe/stonecutting/bricks/malachite.json | 12 -------- .../recipe/stonecutting/bricks/moonstone.json | 12 -------- .../recipe/stonecutting/bricks/onyx.json | 12 -------- .../recipe/stonecutting/bricks/topaz.json | 12 -------- 20 files changed, 98 insertions(+), 182 deletions(-) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/amethyst.json => crafting_table/gem_blocks/amethyst_bricks.json} (62%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/azurite.json => crafting_table/gem_blocks/azurite_bricks.json} (62%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/bloodstone.json => crafting_table/gem_blocks/bloodstone_bricks.json} (61%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/citrine.json => crafting_table/gem_blocks/citrine_bricks.json} (62%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/malachite.json => crafting_table/gem_blocks/malachite_bricks.json} (62%) create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_gemstone_bricks.json create mode 100644 src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_refined_crystal_bricks.json rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/moonstone.json => crafting_table/gem_blocks/moonstone_bricks.json} (62%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/onyx.json => crafting_table/gem_blocks/onyx_bricks.json} (61%) rename src/main/resources/data/spectrum/recipe/{pedestal/tier1/bricks/topaz.json => crafting_table/gem_blocks/topaz_bricks.json} (62%) delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_gemstone_bricks.json delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_refined_crystal_bricks.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/amethyst.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/azurite.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/bloodstone.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/citrine.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/malachite.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/moonstone.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/onyx.json delete mode 100644 src/main/resources/data/spectrum/recipe/stonecutting/bricks/topaz.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/amethyst.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/amethyst_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/amethyst.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/amethyst_bricks.json index d6e2c8b0a6..a511785a05 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/amethyst.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/amethyst_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "minecraft:amethyst_block" + "X": [ + { + "item": "minecraft:amethyst_block" + } + ] }, "result": { "id": "spectrum:amethyst_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/azurite.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/azurite_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/azurite.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/azurite_bricks.json index bb40343084..d40c449387 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/azurite.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/azurite_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:pure_azurite_block" + "X": [ + { + "item": "spectrum:pure_azurite_block" + } + ] }, "result": { "id": "spectrum:azurite_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/bloodstone.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/bloodstone_bricks.json similarity index 61% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/bloodstone.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/bloodstone_bricks.json index 1cc77a19fd..8d2167f66f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/bloodstone.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/bloodstone_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:pure_bloodstone_block" + "X": [ + { + "item": "spectrum:pure_bloodstone_block" + } + ] }, "result": { "id": "spectrum:bloodstone_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/citrine.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/citrine_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/citrine.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/citrine_bricks.json index efa2949a35..d43ae334fd 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/citrine.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/citrine_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:citrine_block" + "X": [ + { + "item": "spectrum:citrine_block" + } + ] }, "result": { "id": "spectrum:citrine_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/malachite.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/malachite_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/malachite.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/malachite_bricks.json index c0b6148325..27b89892d3 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/malachite.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/malachite_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:pure_malachite_block" + "X": [ + { + "item": "spectrum:pure_malachite_block" + } + ] }, "result": { "id": "spectrum:malachite_bricks", diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_gemstone_bricks.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_gemstone_bricks.json new file mode 100644 index 0000000000..7777749b28 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_gemstone_bricks.json @@ -0,0 +1,30 @@ +{ + "type": "spectrum:gated_crafting_shapeless", + "group": "gemstone_bricks", + "time": 40, + "tier": "basic", + "colors": {}, + "experience": 0.0, + "ingredients": [ + { + "item": "spectrum:topaz_block" + }, + { + "item": "minecraft:amethyst_block" + }, + { + "item": "spectrum:citrine_block" + }, + { + "item": "spectrum:onyx_block" + }, + { + "item": "spectrum:moonstone_block" + } + ], + "result": { + "id": "spectrum:mixed_gemstone_bricks", + "count": 5 + }, + "required_advancement": "spectrum:lategame/collect_moonstone" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_refined_crystal_bricks.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_refined_crystal_bricks.json new file mode 100644 index 0000000000..41b2a77756 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/mixed_refined_crystal_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "spectrum:gated_crafting_shapeless", + "group": "gemstone_bricks", + "ingredients": [ + { + "item": "spectrum:pure_azurite_block" + }, + { + "item": "spectrum:pure_malachite_block" + }, + { + "item": "spectrum:pure_bloodstone_block" + } + ], + "result": { + "id": "spectrum:mixed_refined_crystal_bricks", + "count": 16 + }, + "required_advancement": "spectrum:hidden/collect_all_refined_rgb_resources" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/moonstone.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/moonstone_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/moonstone.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/moonstone_bricks.json index 681f6c627f..c01b72d725 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/moonstone.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/moonstone_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:moonstone_block" + "X": [ + { + "item": "spectrum:moonstone_block" + } + ] }, "result": { "id": "spectrum:moonstone_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/onyx.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/onyx_bricks.json similarity index 61% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/onyx.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/onyx_bricks.json index c1cac405e5..8a9d267c4a 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/onyx.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/onyx_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:onyx_block" + "X": [ + { + "item": "spectrum:onyx_block" + } + ] }, "result": { "id": "spectrum:onyx_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/topaz.json b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/topaz_bricks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/topaz.json rename to src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/topaz_bricks.json index 6d8b2dc346..f99fb7dee3 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/topaz.json +++ b/src/main/resources/data/spectrum/recipe/crafting_table/gem_blocks/topaz_bricks.json @@ -1,16 +1,16 @@ { - "type": "spectrum:pedestal", + "type": "spectrum:gated_crafting_shaped", "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, "pattern": [ "XX", "XX" ], "key": { - "X": "spectrum:topaz_block" + "X": [ + { + "item": "spectrum:topaz_block" + } + ] }, "result": { "id": "spectrum:topaz_bricks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_gemstone_bricks.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_gemstone_bricks.json deleted file mode 100644 index 722dcbe7bd..0000000000 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_gemstone_bricks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "spectrum:pedestal_shapeless", - "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, - "ingredients": [ - "spectrum:topaz_block", - "minecraft:amethyst_block", - "spectrum:citrine_block", - "spectrum:onyx_block", - "spectrum:moonstone_block" - ], - "result": { - "id": "spectrum:mixed_gemstone_bricks", - "count": 5 - }, - "required_advancement": "spectrum:lategame/collect_moonstone" -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_refined_crystal_bricks.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_refined_crystal_bricks.json deleted file mode 100644 index 5a1a077024..0000000000 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/bricks/mixed_refined_crystal_bricks.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "spectrum:pedestal_shapeless", - "group": "gemstone_bricks", - "time": 40, - "tier": "basic", - "colors": {}, - "experience": 0.0, - "ingredients": [ - "spectrum:pure_azurite_block", - "spectrum:pure_malachite_block", - "spectrum:pure_bloodstone_block" - ], - "result": { - "id": "spectrum:mixed_refined_crystal_bricks", - "count": 16 - }, - "required_advancement": "spectrum:hidden/collect_all_refined_rgb_resources" -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/amethyst.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/amethyst.json deleted file mode 100644 index a7d29d92ca..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/amethyst.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "minecraft:amethyst_block" - } - ], - "result": { - "id": "spectrum:amethyst_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/azurite.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/azurite.json deleted file mode 100644 index a86f556479..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/azurite.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:pure_azurite_block" - } - ], - "result": { - "id": "spectrum:azurite_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/bloodstone.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/bloodstone.json deleted file mode 100644 index d1900edee3..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/bloodstone.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:pure_bloodstone_block" - } - ], - "result": { - "id": "spectrum:bloodstone_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/citrine.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/citrine.json deleted file mode 100644 index adffc20a47..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/citrine.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:citrine_block" - } - ], - "result": { - "id": "spectrum:citrine_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/malachite.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/malachite.json deleted file mode 100644 index a41b31ec9a..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/malachite.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:pure_malachite_block" - } - ], - "result": { - "id": "spectrum:malachite_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/moonstone.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/moonstone.json deleted file mode 100644 index 132288f0aa..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/moonstone.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:moonstone_block" - } - ], - "result": { - "id": "spectrum:moonstone_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/onyx.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/onyx.json deleted file mode 100644 index 60929201c4..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/onyx.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:onyx_block" - } - ], - "result": { - "id": "spectrum:onyx_bricks", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/topaz.json b/src/main/resources/data/spectrum/recipe/stonecutting/bricks/topaz.json deleted file mode 100644 index d80adafd37..0000000000 --- a/src/main/resources/data/spectrum/recipe/stonecutting/bricks/topaz.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "spectrum:topaz_block" - } - ], - "result": { - "id": "spectrum:topaz_bricks", - "count": 1 - } -} \ No newline at end of file From 02ec8237b419c41816996ad4254d038a4c67d985 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 16:29:41 +0100 Subject: [PATCH 11/16] update guidebook --- .../resources/assets/spectrum/lang/en_us.json | 2 - .../entries/decoration/gemstone_deco.json | 121 +++++++++++------- 2 files changed, 78 insertions(+), 45 deletions(-) diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 236816d4d7..4599f1ece9 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -2875,8 +2875,6 @@ "book.spectrum.guidebook.gemstone_runes.page2.title": "Alternative Recipe", "book.spectrum.guidebook.gemstone_deco.name": "Gemstone Decorations", "book.spectrum.guidebook.gemstone_deco.page0.text": "The gems have an exceptionally beautiful appearance.\\\nHowever, the look of the raw clusters, as I know them from the geodes, seems a little too natural for my edgier builds. As a full block, however, they are beautiful too and fit right in.\\\n\\\nIf I run out of gems at some point, I can easily break the polished ones up again.", - "book.spectrum.guidebook.gemstone_deco.bricks.title": "Gemstone Bricks", - "book.spectrum.guidebook.gemstone_deco.bricks.text": "I thought: *what if they still looked pretty, but in brick form*?\\\n\\\nWorks in both the Pedestal and the [](item://minecraft:stonecutter).", "book.spectrum.guidebook.geodes.name": "Geodes", "book.spectrum.guidebook.geodes.page0.text": "I was told about a strange occurrence underground, but this picture is the only clue I have at the moment.", "book.spectrum.guidebook.geodes.page1.text": "Breaking Clusters gives me Gemstone Shards, which seem to inherit most of the original properties.\\\nEach type of gem seems to represent a different type of fundamental property.\\\n\\\nLooks like different heights encourage the formation of certain types. To find them all, it will make sense to search in different places.", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json index 67a5c8e62f..e692299ff0 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json @@ -36,12 +36,20 @@ }, { "type": "modonomicon:crafting_recipe", - "title1": "block.spectrum.topaz_pillar", "condition": { "type": "modonomicon:advancement", "advancement_id": "spectrum:hidden/collect_shards/topaz" }, - "recipe_id_1": "spectrum:crafting_table/gem_blocks/topaz_pillar" + "recipe_id_1": "spectrum:crafting_table/gem_blocks/chiseled_topaz", + "recipe_id_2": "spectrum:crafting_table/gem_blocks/topaz_pillar" + }, + { + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_shards/topaz" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/topaz_bricks" }, { "type": "modonomicon:crafting_recipe", @@ -59,8 +67,16 @@ "type": "modonomicon:advancement", "advancement_id": "spectrum:hidden/collect_shards/amethyst" }, - "title1": "block.spectrum.amethyst_pillar", - "recipe_id_1": "spectrum:crafting_table/gem_blocks/amethyst_pillar" + "recipe_id_1": "spectrum:crafting_table/gem_blocks/chiseled_amethyst", + "recipe_id_2": "spectrum:crafting_table/gem_blocks/amethyst_pillar" + }, + { + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_shards/amethyst" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/amethyst_bricks" }, { "type": "modonomicon:crafting_recipe", @@ -78,8 +94,16 @@ "type": "modonomicon:advancement", "advancement_id": "spectrum:hidden/collect_shards/citrine" }, - "title1": "block.spectrum.citrine_pillar", - "recipe_id_1": "spectrum:crafting_table/gem_blocks/citrine_pillar" + "recipe_id_1": "spectrum:crafting_table/gem_blocks/chiseled_citrine", + "recipe_id_2": "spectrum:crafting_table/gem_blocks/citrine_pillar" + }, + { + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_shards/citrine" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/citrine_bricks" }, { "type": "modonomicon:crafting_recipe", @@ -97,8 +121,16 @@ "type": "modonomicon:advancement", "advancement_id": "spectrum:create_onyx_shard" }, - "title1": "block.spectrum.onyx_pillar", - "recipe_id_1": "spectrum:crafting_table/gem_blocks/onyx_pillar" + "recipe_id_1": "spectrum:crafting_table/gem_blocks/chiseled_onyx", + "recipe_id_2": "spectrum:crafting_table/gem_blocks/onyx_pillar" + }, + { + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:create_onyx_shard" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/onyx_bricks" }, { "type": "modonomicon:crafting_recipe", @@ -116,53 +148,56 @@ "type": "modonomicon:advancement", "advancement_id": "spectrum:lategame/collect_moonstone" }, - "title1": "block.spectrum.moonstone_pillar", - "recipe_id_1": "spectrum:crafting_table/gem_blocks/moonstone_pillar" - }, - { - "type": "modonomicon:text", - "title": "book.spectrum.guidebook.gemstone_deco.bricks.title", - "text": "book.spectrum.guidebook.gemstone_deco.bricks.text" - }, - { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/topaz" + "recipe_id_1": "spectrum:crafting_table/gem_blocks/chiseled_moonstone", + "recipe_id_2": "spectrum:crafting_table/gem_blocks/moonstone_pillar" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/amethyst" - }, - { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/citrine" - }, - { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/onyx" - }, - { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/moonstone" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:lategame/collect_moonstone" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/moonstone_bricks" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/mixed_gemstone_bricks" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:lategame/collect_moonstone" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/mixed_gemstone_bricks" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/bloodstone" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:grow_bloodstone_in_crystallarieum" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/bloodstone_bricks" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/azurite" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/grow_azurite_in_crystallarieum" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/azurite_bricks" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/malachite" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:lategame/grow_malachite_in_crystallarieum" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/malachite_bricks" }, { - "type": "spectrum:pedestal_crafting", - "recipe_id": "spectrum:pedestal/tier1/bricks/mixed_refined_crystal_bricks" + "type": "modonomicon:crafting_recipe", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:hidden/collect_all_refined_rgb_resources" + }, + "recipe_id_1": "spectrum:crafting_table/gem_blocks/mixed_refined_crystal_bricks" } ] } \ No newline at end of file From 99113bfe49328246ff7aaf23025cf20e8f90570c Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 19:18:11 +0100 Subject: [PATCH 12/16] Split rune guidebook entries between earlygame, midgame and lategame runes. Linked these in the Moonstone Pedestal entry. --- .../blocks/pedestal/PedestalBlock.java | 2 +- .../blocks/pedestal/PedestalBlockEntity.java | 2 +- .../recipe/pedestal/PedestalRecipeTier.java | 2 +- .../registries/SpectrumMultiblocks.java | 2 +- .../resources/assets/spectrum/lang/en_us.json | 39 +++++---- .../resources/assets/spectrum/lang/ko_kr.json | 9 +- .../resources/assets/spectrum/lang/pt_br.json | 13 +-- .../resources/assets/spectrum/lang/ru_ru.json | 10 +-- .../resources/assets/spectrum/lang/zh_cn.json | 12 +-- ..._pedestal_structure_without_moonstone.json | 2 +- .../lategame/collect_enough_hints.json | 2 +- .../entries/decoration/banner_patterns.json | 2 +- .../entries/decoration/earlygame_runes.json | 82 +++++++++++++++++++ .../entries/decoration/gemstone_chimes.json | 4 +- .../entries/decoration/gemstone_deco.json | 6 +- .../entries/decoration/gemstone_glass.json | 4 +- .../entries/decoration/gemstone_lights.json | 5 +- .../{pylons.json => gemstone_pylons.json} | 4 +- .../entries/decoration/gemstone_runes.json | 44 ---------- .../entries/decoration/lategame_runes.json | 36 ++++++++ .../entries/decoration/midgame_runes.json | 36 ++++++++ .../entries/decoration/resplendent_deco.json | 4 +- .../guidebook/entries/decoration/shards.json | 4 +- .../general/pedestal_upgrade_moonstone.json | 2 +- ... pedestal_complex_without_engravings.json} | 0 25 files changed, 217 insertions(+), 111 deletions(-) create mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/earlygame_runes.json rename src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/{pylons.json => gemstone_pylons.json} (98%) delete mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_runes.json create mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json create mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json rename src/main/resources/data/spectrum/modonomicon/multiblocks/{pedestal_complex_without_moonstone.json => pedestal_complex_without_engravings.json} (100%) diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlock.java index 486a65e5ef..e7b4bff690 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlock.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlock.java @@ -72,7 +72,7 @@ public static void clearCurrentlyRenderedMultiBlock(Level world) { ModonomiconHelper.clearRenderedMultiblock(SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_SIMPLE)); ModonomiconHelper.clearRenderedMultiblock(SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_ADVANCED)); ModonomiconHelper.clearRenderedMultiblock(SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_COMPLEX)); - ModonomiconHelper.clearRenderedMultiblock(SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_MOONSTONE)); + ModonomiconHelper.clearRenderedMultiblock(SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_ENGRAVINGS)); } } diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java index 57f13cb772..1c45a82521 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java @@ -846,7 +846,7 @@ private PedestalRecipeTier getStructureTier() { return PedestalRecipeTier.COMPLEX; } - multiblock = SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_MOONSTONE); + multiblock = SpectrumMultiblocks.get(SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_ENGRAVINGS); if (multiblock.validate(level, worldPosition.below(), Rotation.NONE)) { SpectrumAdvancementCriteria.COMPLETED_MULTIBLOCK.trigger((ServerPlayer) this.getOwnerIfOnline(level), multiblock); return PedestalRecipeTier.ADVANCED; diff --git a/src/main/java/de/dafuqs/spectrum/recipe/pedestal/PedestalRecipeTier.java b/src/main/java/de/dafuqs/spectrum/recipe/pedestal/PedestalRecipeTier.java index 8be25ef159..9634a12f6e 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/pedestal/PedestalRecipeTier.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/pedestal/PedestalRecipeTier.java @@ -79,7 +79,7 @@ public static Optional hasJustUnlockedANewRecipeTier(Resourc if (AdvancementHelper.hasAdvancement(player, SpectrumAdvancements.BUILD_COMPLEX_PEDESTAL_STRUCTURE_WITHOUT_MOONSTONE)) { return SpectrumMultiblocks.PEDESTAL_COMPLEX; } else { - return SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_MOONSTONE; + return SpectrumMultiblocks.PEDESTAL_COMPLEX_WITHOUT_ENGRAVINGS; } } case ADVANCED -> { diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumMultiblocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumMultiblocks.java index 21a9d8fcdc..bc806832f8 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumMultiblocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumMultiblocks.java @@ -15,7 +15,7 @@ public class SpectrumMultiblocks { public static final ResourceLocation PEDESTAL_ADVANCED = SpectrumCommon.locate("pedestal_advanced"); public static final Component PEDESTAL_COMPLEX_TEXT = Component.translatable("multiblock.spectrum.pedestal_complex"); public static final ResourceLocation PEDESTAL_COMPLEX = SpectrumCommon.locate("pedestal_complex"); - public static final ResourceLocation PEDESTAL_COMPLEX_WITHOUT_MOONSTONE = SpectrumCommon.locate("pedestal_complex_without_moonstone"); + public static final ResourceLocation PEDESTAL_COMPLEX_WITHOUT_ENGRAVINGS = SpectrumCommon.locate("pedestal_complex_without_engravings"); public static final Component FUSION_SHRINE_TEXT = Component.translatable("multiblock.spectrum.fusion_shrine"); public static final ResourceLocation FUSION_SHRINE = SpectrumCommon.locate("fusion_shrine"); diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 4599f1ece9..d9ea08622d 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -37,7 +37,7 @@ "advancements.spectrum.build_cinderhearth_without_lava_structure.title": "Was that really necessary?", "advancements.spectrum.build_complex_pedestal_structure.description": "Upgrade your Pedestal Structure one last time to fully harness its magical powers", "advancements.spectrum.build_complex_pedestal_structure.title": "Construct the Spectrum Complex", - "advancements.spectrum.build_complex_pedestal_structure_without_moonstone.description": "\"Borrow\" some Moonstone Chiseled Blocks to expand your own Pedestal Structure", + "advancements.spectrum.build_complex_pedestal_structure_without_moonstone.description": "\"Borrow\" some Moonstone Engraved Blocks to expand your own Pedestal Structure", "advancements.spectrum.build_complex_pedestal_structure_without_moonstone.title": "A Missing Puzzle Piece", "advancements.spectrum.collect_aether_vestiges.description": "Collect the vestiges of an Aether Shard", "advancements.spectrum.collect_aether_vestiges.title": "Unknowable", @@ -2867,12 +2867,17 @@ "book.spectrum.guidebook.gemstone_powder.page0.text": "Most recipes in the Pedestal will require a certain amount of Gemstone Powder as a catalyst.\\\n\\\nIf I do not find some, I can get it by pulverizing [Gem Shards](entry://general/shards) via [Item Crushing](entry://general/item_crushing).", "book.spectrum.guidebook.gemstone_powder.page1.text": "There's nothing more important to a budding artist than mixing the right color.\\\nUnfortunately, I found that in the case of Gemstone Powder, it wasn't nearly as easy as it first seemed. *The powders don't quite want to mix*, the result always just being a bland, multicolored mass.\\\n\\\nMaybe I can come up with something later?", "book.spectrum.guidebook.gemstone_powder.page1.title": "Mixing Colors", - "book.spectrum.guidebook.gemstone_powder.page2.text": "Gemstone Powder can be compacted for storage or decoration.", - "book.spectrum.guidebook.gemstone_runes.name": "Gemstone Chiseled Blocks", - "book.spectrum.guidebook.gemstone_runes.page0.text": "The [#](bb00bb)Calcite[#]() and [#](bb00bb)Basalt[#]() keep the gem's energies at bay as long as they completely enclose the geode, that much is certain. Sometimes, however, the energy that has built up over the centuries seems to be so strong that it literally tears a hole into the geode.\\\n\\\nI recreated the whole thing in miniature.", - "book.spectrum.guidebook.gemstone_runes.page1.text": "I can build them out of every gemstone I found. Both [Chiseled Calcite and Chiseled Basalt](entry://decoration/block_variants@chiseled_and_notched) will do for the frame.", - "book.spectrum.guidebook.gemstone_runes.page2.text": "These things are much more efficient to create, if I can get an intact gem cluster.", - "book.spectrum.guidebook.gemstone_runes.page2.title": "Alternative Recipe", + "book.spectrum.guidebook.gemstone_powder.page2.text": "Gemstone Powder can be compacted forf storage or decoration.", + "book.spectrum.guidebook.earlygame_runes.name": "Gemstone Chiseled Blocks", + "book.spectrum.guidebook.earlygame_runes.about.text": "The [#](bb00bb)Calcite[#]() and [#](bb00bb)Basalt[#]() keep the gem's energies at bay as long as they completely enclose the geode, that much is certain. Sometimes, however, the energy that has built up over the centuries seems to be so strong that it literally tears a hole into the geode.\\\n\\\nI recreated the whole thing in miniature.", + "book.spectrum.guidebook.earlygame_runes.crafting.text": "I can build them out of every gemstone I found. Both [Chiseled Calcite and Chiseled Basalt](entry://decoration/block_variants@chiseled_and_notched) will do for the frame.\\\n\\\nThese things are much more efficient to create if I can get hold of intact gem clusters somehow.", + "book.spectrum.guidebook.earlygame_runes.page2.title": "Alternative Recipe", + "book.spectrum.guidebook.midgame_runes.name": "Onyx Engraved Blocks", + "book.spectrum.guidebook.midgame_runes.about.text": "Energy pulsates through these stones.", + "book.spectrum.guidebook.midgame_runes.flavor.text": "*When something needs a bit more oomph (both visually and functionally).*", + "book.spectrum.guidebook.lategame_runes.name": "Moonstone Engraved Blocks", + "book.spectrum.guidebook.lategame_runes.about.text": "I can't even get started here without a good amount of moonstone powder.", + "book.spectrum.guidebook.lategame_runes.flavor.text": "*Just standing on one of these gives me goosebumps.*", "book.spectrum.guidebook.gemstone_deco.name": "Gemstone Decorations", "book.spectrum.guidebook.gemstone_deco.page0.text": "The gems have an exceptionally beautiful appearance.\\\nHowever, the look of the raw clusters, as I know them from the geodes, seems a little too natural for my edgier builds. As a full block, however, they are beautiful too and fit right in.\\\n\\\nIf I run out of gems at some point, I can easily break the polished ones up again.", "book.spectrum.guidebook.geodes.name": "Geodes", @@ -3713,15 +3718,15 @@ "book.spectrum.guidebook.pedestal_upgrade_cmy.page3.text": "- 1 Pigment Pedestal\n- 4 Polished Gemstone Blocks\n- 4 Chiseled Polished Blocks\n- 4 Notched Polished Blocks\n- 8 Polished Pillars\n- 68 Polished Blocks", "book.spectrum.guidebook.pedestal_upgrade_moonstone.dimensions": "Dimensions: 13x13x7 blocks", "book.spectrum.guidebook.pedestal_upgrade_moonstone.name": "Moonstone Pedestal", - "book.spectrum.guidebook.pedestal_upgrade_moonstone.page0.text": "I can upgrade my [Pigment Pedestal](entry://general/pedestal) by using a [Moonstone Shard](entry://general/shards@moonstone).", - "book.spectrum.guidebook.pedestal_upgrade_moonstone.page2.text": "- 1 Pigment Pedestal\n- 4 Onyx Chiseled Blocks\n- 4 Notched Polished Blocks\n- 8 Gemstone Lights\n- 4 Gemstone Chiseled Blocks\n- 12 Polished Gemstone Blocks\n- 16 CMYK Chiseled Blocks\n- 36 Polished Pillars\n- 52 Polished Crests\n- 172 Polished Blocks", - "book.spectrum.guidebook.pedestal_upgrade_moonstone.page3.text": "- 4 Onyx Chiseled Blocks\n- 4 Polished Gemstone Blocks\n- 36 Polished Crests\n- 12 Polished Blocks", + "book.spectrum.guidebook.pedestal_upgrade_moonstone.page0.text": "I can upgrade my [Pigment Pedestal](entry://general/pedestal) with a [Moonstone Shard](entry://general/shards@moonstone).", + "book.spectrum.guidebook.pedestal_upgrade_moonstone.page2.text": "- 1 Pigment Pedestal\n- 4 Onyx Engraved Blocks\n- 4 Notched Polished Blocks\n- 8 Gemstone Lights\n- 4 Gemstone Chiseled Blocks\n- 12 Polished Gemstone Blocks\n- 16 CMYK Chiseled Blocks\n- 36 Polished Pillars\n- 52 Polished Crests\n- 172 Polished Blocks", + "book.spectrum.guidebook.pedestal_upgrade_moonstone.page3.text": "- 4 Onyx Engraved Blocks\n- 4 Polished Gemstone Blocks\n- 36 Polished Crests\n- 12 Polished Blocks", "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.name": "Moonstone Pedestal (2)", - "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page0.text": "My latest structure feels... lacking. And now I know exactly why: more [#](b9bebe)Moonstone[#]()! The tricky part: for me being able to create [#](bb00bb)Moonstone Chiseled Blocks[#]() would require me to use the full capabilities of my [#](bb00bb)Moonstone Pedestal[#]() already, but without the finished structure I can't use Moonstone Powder yet.\\\n*Could there be a way around this? A kickstart, if you will?*", - "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page2.text": "- 1 Pigment Pedestal\n- 4 Onyx Chiseled Blocks\n- 4 Notched Polished Blocks\n- 8 Gemstone Lights\n- 4 Gemstone Chiseled Blocks\n- 12 Polished Gemstone Blocks\n- 16 CMY Gemstone Chiseled Bl.\n- 28 Moonstone Chiseled Bl.\n- 36 Polished Pillars\n- 52 Polished Crests\n- 144 Polished Blocks", - "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page3.text": "- 28 Moonstone Chiseled Bl.", + "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page0.text": "My latest structure feels... lacking. And now I know exactly: [engraved Moonstone foci](entry://decoration/lategame_runes)!\\\nThe tricky part: for me being able to create these requires me to use the full capabilities of my [#](bb00bb)Moonstone Pedestal[#]() already. But without the finished structure I can't use the required Moonstone Powder yet...\\\n*Could there be a way around this? A kickstart, if you will?*", + "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page2.text": "- 1 Pigment Pedestal\n- 4 Onyx Engraved Blocks\n- 4 Notched Polished Blocks\n- 8 Gemstone Lights\n- 4 Gemstone Chiseled Blocks\n- 12 Polished Gemstone Blocks\n- 16 CMY Gemstone Chiseled Blocks\n- 28 Moonstone Engraved Bl.\n- 36 Polished Pillars\n- 52 Polished Crests\n- 144 Polished Blocks", + "book.spectrum.guidebook.pedestal_upgrade_moonstone_2.page3.text": "- 28 Moonstone Engraved Blocks", "book.spectrum.guidebook.pedestal_upgrade_onyx.name": "Pedestal Onyx Upgrade", - "book.spectrum.guidebook.pedestal_upgrade_onyx.page0.text": "I can upgrade my [Pigment Pedestal](entry://general/pedestal) by using an [Onyx Shard](entry://general/shards@onyx) to further increase its magical power.", + "book.spectrum.guidebook.pedestal_upgrade_onyx.page0.text": "I can upgrade my [Pigment Pedestal](entry://general/pedestal) with an [Onyx Shard](entry://general/shards@onyx) to further increase its magical power.", "book.spectrum.guidebook.pedestal_upgrade_onyx.page0.title": "Onyx Variant", "book.spectrum.guidebook.pedestal_upgrade_onyx.page1.text": "Dimensions: 13x13x6 blocks", "book.spectrum.guidebook.pedestal_upgrade_onyx.page2.text": "- 1 Pigment Pedestal\n- 8 Polished Gemstone Blocks\n- 8 Gemstone Lights\n- 4 Chiseled Polished Blocks\n- 16 Gemstone Chiseled Blocks\n- 16 Polished Crests\n- 4 Notched Polished Blocks\n- 36 Polished Pillars\n- 160 Polished Blocks", @@ -4064,8 +4069,8 @@ "book.spectrum.guidebook.spawner_manipulation.required_player_range_change.title": "Activation Range", "book.spectrum.guidebook.spirit_instiller.page0.text": "With all the knowledge I gathered, I created the **Spirit Instiller**. I specifically designed it to combine the energies of two items, with the help of a third object to bind them.\\\nLike the others, the Spirit Instiller needs a focus structure to work. To rotate the structure hologram in the direction I want it to go, I am able click on the Spirit Instiller when it is placed.", "book.spectrum.guidebook.spirit_instiller.page1.text": "An almost spiritual process, hence the name.", - "book.spectrum.guidebook.spirit_instiller.page2.text": "Dimensions: 8x9x5 blocks\\\nIt can be enhanced by placing [Upgrades](entry://magical_blocks/upgrades) on the two [#](bb00bb)Onyx Chiseled Blocks[#]().", - "book.spectrum.guidebook.spirit_instiller.page3.text": "- 1 Spirit Instiller\n- 2 Item Bowls\n- 2 Notched Polished Blocks\n- 2 Chiseled Polished Blocks\n- 2 Onyx Chiseled Blocks\n- 6 Polished Pillars\n- 17 Polished Slabs\n- 41 Polished Blocks\n- 2 Gemstone Chimes", + "book.spectrum.guidebook.spirit_instiller.page2.text": "Dimensions: 8x9x5 blocks\\\nIt can be enhanced by placing [Upgrades](entry://magical_blocks/upgrades) on the two [Onyx Engraved Blocks](entry://decoration/midgame_runes).", + "book.spectrum.guidebook.spirit_instiller.page3.text": "- 1 Spirit Instiller\n- 2 Item Bowls\n- 2 Notched Polished Blocks\n- 2 Chiseled Polished Blocks\n- 2 Onyx Engraved Blocks\n- 6 Polished Pillars\n- 17 Polished Slabs\n- 41 Polished Blocks\n- 2 Gemstone Chimes", "book.spectrum.guidebook.spirit_instiller_recipe": "Spirit Inst. Recipe", "book.spectrum.guidebook.stacking_effect": "Stacking Effect", "book.spectrum.guidebook.staff_of_remembrance.page0.text": "*One to rule them all*\\\n...well, politely, of course.\\\n\\\nThe Staff of Remembrance allows me to move around my animals with ease, over both short and long distances.", @@ -5427,6 +5432,8 @@ "recipeGroup.spectrum.colorful_azaleas_ink": "Ink from Colorful Azaleas", "recipeGroup.spectrum.gemstone_bricks": "Gemstone Bricks", "recipeGroup.spectrum.symbolics": "Symbolic Blocks", + "recipeGroup.spectrum.onyx_engraved_blocks": "Onyx Engraved Blocks", + "recipeGroup.spectrum.moonstone_engraved_blocks": "Moonstone Engraved Blocks", "spectrum.gui.guidebook.reveal_hint_button.text": "Uncover Insight ", "spectrum.gui.guidebook.reveal_hint_button.tooltip.lacking_resource": "You do not have this in your inventory", diff --git a/src/main/resources/assets/spectrum/lang/ko_kr.json b/src/main/resources/assets/spectrum/lang/ko_kr.json index 5c220a9e5d..06e893330d 100644 --- a/src/main/resources/assets/spectrum/lang/ko_kr.json +++ b/src/main/resources/assets/spectrum/lang/ko_kr.json @@ -2707,11 +2707,10 @@ "book.spectrum.guidebook.gemstone_powder.page1.text": "새내기 화가에게 알맞은 색을 조합하는 것보다 더 중요한 일은 없다.\\\n하지만 안타깝게도, 보석 가루의 경우에는 처음 생각했던 것만큼 결코 호락호락하지 않았다. *이 가루들은 도무지 서로 섞이려 들지를 않았고*, 결과물은 항상 칙칙하고 여러 색이 엉망으로 섞인 덩어리에 불과했다.\\\n\\\n나중에 뭔가 다른 좋은 방법이 떠오르려나?", "book.spectrum.guidebook.gemstone_powder.page1.title": "색상 혼합", "book.spectrum.guidebook.gemstone_powder.page2.text": "보석 가루를 압축하면 보관하거나 장식용으로 훌륭한 블록을 만들 수 있다.", - "book.spectrum.guidebook.gemstone_runes.name": "조각된 보석 블록", - "book.spectrum.guidebook.gemstone_runes.page0.text": "[#](bb00bb)방해석[#]()과 [#](bb00bb)현무암[#]()이 정동을 완전히 둘러싸고 있는 한 보석의 에너지를 억제할 수 있다는 사실만큼은 확실하다. 하지만 때때로 수 세기에 걸쳐 응축된 에너지가 너무나도 강렬한 나머지 말 그대로 정동에 구멍을 뚫고 터져 나오는 경우가 있는 것 같다.\\\n\\\n나는 그 현상을 아주 작은 축소판으로 재현해 냈다.", - "book.spectrum.guidebook.gemstone_runes.page1.text": "내가 발견한 모든 종류의 보석을 이용해 만들어낼 수 있다. [조각된 방해석과 조각된 현무암](entry://decoration/block_variants@chiseled_and_notched) 둘 다 테두리로 쓰기에 안성맞춤이다.", - "book.spectrum.guidebook.gemstone_runes.page2.text": "온전한 보석 군집을 구할 수만 있다면, 이런 것들을 만드는 게 훨씬 더 수월해질 것이다.", - "book.spectrum.guidebook.gemstone_runes.page2.title": "대체 레시피", + "book.spectrum.guidebook.earlygame_runes.name": "조각된 보석 블록", + "book.spectrum.guidebook.earlygame_runes.about.text": "[#](bb00bb)방해석[#]()과 [#](bb00bb)현무암[#]()이 정동을 완전히 둘러싸고 있는 한 보석의 에너지를 억제할 수 있다는 사실만큼은 확실하다. 하지만 때때로 수 세기에 걸쳐 응축된 에너지가 너무나도 강렬한 나머지 말 그대로 정동에 구멍을 뚫고 터져 나오는 경우가 있는 것 같다.\\\n\\\n나는 그 현상을 아주 작은 축소판으로 재현해 냈다.", + "book.spectrum.guidebook.earlygame_runes.crafting.text": "내가 발견한 모든 종류의 보석을 이용해 만들어낼 수 있다. [조각된 방해석과 조각된 현무암](entry://decoration/block_variants@chiseled_and_notched) 둘 다 테두리로 쓰기에 안성맞춤이다.\\\n\\\n온전한 보석 군집을 구할 수만 있다면, 이런 것들을 만드는 게 훨씬 더 수월해질 것이다.", + "book.spectrum.guidebook.earlygame_runes.page2.title": "대체 레시피", "book.spectrum.guidebook.gemstone_deco.name": "보석 장식", "book.spectrum.guidebook.gemstone_deco.page0.text": "보석들은 그 자체로도 비할 데 없이 아름다운 자태를 뽐낸다.\\\n하지만 정동에서 갓 캐낸 거친 원석 덩어리의 모습은, 내 다소 각 잡힌 건축물들에 쓰기에는 너무 거친 자연의 느낌이 강하다. 이를 온전한 블록 형태로 매끄럽게 가공해 내니, 이제야 주변 환경에 아주 아름답게 어우러진다.\\\n\\\n만약 어느 순간 보석이 바닥난다면, 이 윤나는 블록들을 다시 부숴서 사용할 수도 있다.", "book.spectrum.guidebook.gemstone_deco.bricks.title": "보석 벽돌", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index 270d0a5380..e70fa82c94 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -3233,15 +3233,12 @@ "book.spectrum.guidebook.gemstone_powder.page1.text": "There's nothing more important to a budding artist than mixing the right color.\\\nUnfortunately, I found that in the case of Gemstone Powder, it wasn't nearly as easy as it first seemed. *The powders don't quite want to mix*, the result always just being a bland, multicolored mass.\\\n\\\nMaybe I can come up with something later?", "book.spectrum.guidebook.gemstone_powder.page1.title": "Mixing Colors", "book.spectrum.guidebook.gemstone_powder.page2.text": "Gemstone Powder can be compacted for storage or decoration.", - "book.spectrum.guidebook.gemstone_runes.name": "Gemstone Chiseled Blocks", - "book.spectrum.guidebook.gemstone_runes.page0.text": "The [#](bb00bb)Calcite[#]() and [#](bb00bb)Basalt[#]() keep the gem's energies at bay as long as they completely enclose the geode, that much is certain. Sometimes, however, the energy that has built up over the centuries seems to be so strong that it literally tears a hole into the geode.\\\n\\\nI recreated the whole thing in miniature.", - "book.spectrum.guidebook.gemstone_runes.page1.text": "I can build them out of every gemstone I found. Both [Chiseled Calcite and Chiseled Basalt](entry://decoration/block_variants@chiseled_and_notched) will do for the frame.", - "book.spectrum.guidebook.gemstone_runes.page2.text": "These things are much more efficient to create, if I can get an intact gem cluster.", - "book.spectrum.guidebook.gemstone_runes.page2.title": "Alternative Recipe", + "book.spectrum.guidebook.earlygame_runes.name": "Gemstone Chiseled Blocks", + "book.spectrum.guidebook.earlygame_runes.about.text": "The [#](bb00bb)Calcite[#]() and [#](bb00bb)Basalt[#]() keep the gem's energies at bay as long as they completely enclose the geode, that much is certain. Sometimes, however, the energy that has built up over the centuries seems to be so strong that it literally tears a hole into the geode.\\\n\\\nI recreated the whole thing in miniature.", + "book.spectrum.guidebook.earlygame_runes.crafting.text": "I can build them out of every gemstone I found. Both [Chiseled Calcite and Chiseled Basalt](entry://decoration/block_variants@chiseled_and_notched) will do for the frame.\\\n\\\nThese things are much more efficient to create, if I can get an intact gem cluster.", + "book.spectrum.guidebook.earlygame_runes.page2.title": "Alternative Recipe", "book.spectrum.guidebook.gemstone_deco.name": "Gemstone Decorations", "book.spectrum.guidebook.gemstone_deco.page0.text": "The gems have an exceptionally beautiful appearance.\\\nHowever, the look of the raw clusters, as I know them from the geodes, seems a little too natural for my edgier builds. As a full block, however, they are beautiful too and fit right in.\\\n\\\nIf I run out of gems at some point, I can easily break the polished ones up again.", - "book.spectrum.guidebook.gemstone_deco.bricks.title": "Gemstone Bricks", - "book.spectrum.guidebook.gemstone_deco.bricks.text": "I thought: *what if they still looked pretty, but in brick form*?\\\n\\\nWorks in both the Pedestal and the [](item://minecraft:stonecutter).", "book.spectrum.guidebook.geodes.name": "Geodes", "book.spectrum.guidebook.geodes.page0.text": "I was told about a strange occurrence underground, but this picture is the only clue I have at the moment.", "book.spectrum.guidebook.geodes.page1.text": "Breaking Clusters gives me Gemstone Shards, which seem to inherit most of the original properties.\\\nEach type of gem seems to represent a different type of fundamental property.\\\n\\\nLooks like different heights encourage the formation of certain types. To find them all, it will make sense to search in different places.", @@ -4009,8 +4006,6 @@ "book.spectrum.guidebook.noxwood.name": "Noxwood", "book.spectrum.guidebook.noxwood.page0.text": "A type of mushroom – or is it more a tree? – which can be found all over the [Noxshroom Forest](entry://dimension/noxshroom_forest). They come in a variety of colors.\\\n\\\nThe trunks are as firm as wood, while the caps are almost soft and squishy. The bioluminescent gills give off a pleasant glow, which makes them excellent light sources.", "book.spectrum.guidebook.noxwood.page1.text": "So good, every bite makes me giddy with joy.", - "book.spectrum.guidebook.noxwood.page2.title": "So much room", - "book.spectrum.guidebook.noxwood.page3.title": "for activities", "book.spectrum.guidebook.noxwood.page4.text": "Both stripped and non-stripped.", "book.spectrum.guidebook.noxwood.page4.title": "Hyphae", "book.spectrum.guidebook.noxwood.page5.text": "Lights up when powered by [#](bb00bb)Redstone[#]().", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index 04b7cfe1df..b6a918f282 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -2701,11 +2701,11 @@ "book.spectrum.guidebook.gemstone_powder.page1.text": "Для начинающего художника нет ничего важнее, чем правильно смешивать цвета.\\\nК сожалению, в случае с порошком самоцветов я обнаружил, что это не так просто, как кажется на первый взгляд. *Порошки не хотят смешиваться*, и в результате всегда получается просто пустая, разноцветная масса.\\\n\\\nМожет быть, я смогу придумать что-нибудь позже?", "book.spectrum.guidebook.gemstone_powder.page1.title": "Смешивание цветов", "book.spectrum.guidebook.gemstone_powder.page2.text": "Самоцветный порошок может быть сжат для хранения или декорации.", - "book.spectrum.guidebook.gemstone_runes.name": "Блоки с инкрустированными самоцветами", - "book.spectrum.guidebook.gemstone_runes.page0.text": "[#](bb00bb)Кальцит[#]() и [#](bb00bb)базальт[#]() удерживают энергию самоцветов, пока они полностью окружают жеоду. Однако иногда энергия, накапливавшаяся веками, становится настолько сильной, что пробивает дыру в жеоде.\\\n\\\nЯ воссоздал всё это в миниатюре.", - "book.spectrum.guidebook.gemstone_runes.page1.text": "Я могу сделать их из каждого самоцвета, что нахожу. Оба [полированный кальцит и полированный базальт](entry://decoration/block_variants@chiseled_and_notched) подойдут для рамки.", - "book.spectrum.guidebook.gemstone_runes.page2.text": "Создание инкрустированных блоков будет намного эффективнее, если мне удастся получить нетронутую самоцветную друзу.", - "book.spectrum.guidebook.gemstone_runes.page2.title": "Альтернативный рецепт", + "book.spectrum.guidebook.earlygame_runes.name": "Блоки с инкрустированными самоцветами", + "book.spectrum.guidebook.earlygame_runes.about.text": "[#](bb00bb)Кальцит[#]() и [#](bb00bb)базальт[#]() удерживают энергию самоцветов, пока они полностью окружают жеоду. Однако иногда энергия, накапливавшаяся веками, становится настолько сильной, что пробивает дыру в жеоде.\\\n\\\nЯ воссоздал всё это в миниатюре.", + "book.spectrum.guidebook.earlygame_runes.crafting.text": "Я могу сделать их из каждого самоцвета, что нахожу. Оба [полированный кальцит и полированный базальт](entry://decoration/block_variants@chiseled_and_notched) подойдут для рамки.", + "book.spectrum.guidebook.earlygame_runes.page2.text": "Создание инкрустированных блоков будет намного эффективнее, если мне удастся получить нетронутую самоцветную друзу.", + "book.spectrum.guidebook.earlygame_runes.page2.title": "Альтернативный рецепт", "book.spectrum.guidebook.gemstone_deco.name": "Самоцветные декорации", "book.spectrum.guidebook.gemstone_deco.page0.text": "Самоцветы имеют исключительно красивый внешний вид.\\\nОднако, внешний вид необработанных друз, как я их знаю по жеодам, кажется немного слишком естественным для моих современных зданий, однако как цельный блок они красиво выглядят и идеально вписываются.\\\n\\\nА если в какой-то момент у меня закончатся самоцветы, декор можно будет легко разбить.", "book.spectrum.guidebook.gemstone_deco.bricks.title": "Самоцветные кирпичи", diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index 522c1c9967..9669a08570 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -4293,18 +4293,14 @@ "book.spectrum.guidebook.gemstone_powder.page1.text": "新晋艺术家的第一课便是学会调配正确的颜色。\\\n然而，我发现宝石晶粉末的混合似乎并不像我以为的那么容易。**这些粉末几乎无法相融**，最后只能得到一坨五颜六色的混杂物。\\\n\\\n或许我之后能想出个好点子?", "book.spectrum.guidebook.gemstone_powder.page2.text": "宝石晶粉末可以压缩便于存储或装饰。", - "book.spectrum.guidebook.gemstone_runes.name": "雕纹宝石晶岩石方块", - "book.spectrum.guidebook.gemstone_runes.page0.text": "可以肯定的是，只要[#](bb00bb)方解石[#]()和[#](bb00bb)玄武岩[#]()将晶洞牢牢包围住，就能锁住宝石晶的能量，但有时，历经几百年积累的能量似乎强大到足以在晶洞中撕开一道裂口。\\\n\\\n我把这一现象微型复刻了出来。", - "book.spectrum.guidebook.gemstone_runes.page1.text": "雕纹宝石晶岩石方块的材质取决于选用的宝石晶材料。可以用[磨制方解石或磨制玄武岩](entry://decoration/block_variants@chiseled_and_notched)作为合成原料。", - "book.spectrum.guidebook.gemstone_runes.page2.title": "替代配方", - "book.spectrum.guidebook.gemstone_runes.page2.text": "如果我有完整的宝石晶簇来进行合成，效率就高多了。", + "book.spectrum.guidebook.earlygame_runes.name": "雕纹宝石晶岩石方块", + "book.spectrum.guidebook.earlygame_runes.about.text": "可以肯定的是，只要[#](bb00bb)方解石[#]()和[#](bb00bb)玄武岩[#]()将晶洞牢牢包围住，就能锁住宝石晶的能量，但有时，历经几百年积累的能量似乎强大到足以在晶洞中撕开一道裂口。\\\n\\\n我把这一现象微型复刻了出来。", + "book.spectrum.guidebook.earlygame_runes.crafting.text": "雕纹宝石晶岩石方块的材质取决于选用的宝石晶材料。可以用[磨制方解石或磨制玄武岩](entry://decoration/block_variants@chiseled_and_notched)作为合成原料。\\\n\\\n如果我有完整的宝石晶簇来进行合成，效率就高多了。", + "book.spectrum.guidebook.earlygame_runes.page2.title": "替代配方", "book.spectrum.guidebook.gemstone_deco.name": "宝石晶块", "book.spectrum.guidebook.gemstone_deco.page0.text": "这些宝石晶的外观实在是绚烂夺目。\\\n不过，晶洞里的原始晶簇样式，对我偏狂野风格的建筑来说，又显得有点太自然了。但做成完整方块后就漂亮多了，而且显得非常搭。\\\n\\\n如果哪天宝石用完了，我也可以轻松把压缩后的宝石晶块重新还原打碎。", - "book.spectrum.guidebook.gemstone_deco.bricks.title": "宝石晶砖", - "book.spectrum.guidebook.gemstone_deco.bricks.text": "我当时就想: *要是把宝石做成砖块，还能一样好看吗*?\\\n\\\n结果还真行。在基座和[切石机](item://minecraft:stonecutter)里都能制作。", - "book.spectrum.guidebook.pylons.name": "宝石晶塔", "book.spectrum.guidebook.pylons.page0.text": "宝石晶洞总有种难以言说的灵气。看着这些水晶，映射着迷人的光影，实在是令人叹为观止。\\\n\\\n这些晶塔有望能截取一分那样的壮阔。尽管不如晶洞那么磅礴，它们也如指路明灯般矗立而闪耀着斑斓", diff --git a/src/main/resources/data/spectrum/advancement/lategame/build_complex_pedestal_structure_without_moonstone.json b/src/main/resources/data/spectrum/advancement/lategame/build_complex_pedestal_structure_without_moonstone.json index 1efbf05561..b33e6d6be4 100644 --- a/src/main/resources/data/spectrum/advancement/lategame/build_complex_pedestal_structure_without_moonstone.json +++ b/src/main/resources/data/spectrum/advancement/lategame/build_complex_pedestal_structure_without_moonstone.json @@ -16,7 +16,7 @@ "built_structure": { "trigger": "spectrum:completed_multiblock", "conditions": { - "multiblock_identifier": "spectrum:pedestal_complex_without_moonstone" + "multiblock_identifier": "spectrum:pedestal_complex_without_engravings" } }, "built_complete_structure": { diff --git a/src/main/resources/data/spectrum/advancement/lategame/collect_enough_hints.json b/src/main/resources/data/spectrum/advancement/lategame/collect_enough_hints.json index d5c9c0ca10..06148c5065 100644 --- a/src/main/resources/data/spectrum/advancement/lategame/collect_enough_hints.json +++ b/src/main/resources/data/spectrum/advancement/lategame/collect_enough_hints.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "id": "spectrum:pedestal_moonstone" + "id": "minecraft:writeable_book" }, "frame": "challenge", "title": { diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/banner_patterns.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/banner_patterns.json index 11d318375b..1d6d0d85f5 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/banner_patterns.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/banner_patterns.json @@ -12,7 +12,7 @@ "parents": [], "background_u_index": 0, "background_v_index": 0, - "x": 2, + "x": 6, "y": -3, "pages": [ { diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/earlygame_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/earlygame_runes.json new file mode 100644 index 0000000000..ce3c20f448 --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/earlygame_runes.json @@ -0,0 +1,82 @@ +{ + "name": "book.spectrum.guidebook.earlygame_runes.name", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:build_basic_pedestal_structure" + }, + "icon": { + "item": "spectrum:citrine_chiseled_calcite" + }, + "category": "spectrum:decoration", + "hide_while_locked": true, + "parents": [ + { + "entry": "spectrum:decoration/shards", + "line_reversed": true + }, + { + "entry": "spectrum:decoration/block_variants", + "line_reversed": true + } + ], + "background_u_index": 0, + "background_v_index": 0, + "x": 2, + "y": -1, + "pages": [ + { + "type": "modonomicon:text", + "title": "book.spectrum.guidebook.earlygame_runes.name", + "text": "book.spectrum.guidebook.earlygame_runes.about.text" + }, + { + "type": "modonomicon:text", + "text": "book.spectrum.guidebook.earlygame_runes.crafting.text" + }, + { + "type": "spectrum:pedestal_crafting", + "recipe_id": "spectrum:pedestal/tier2/runes/topaz_chiseled_calcite_from_shards" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier2/runes/topaz_chiseled_basalt_from_cluster" + }, + { + "type": "spectrum:pedestal_crafting", + "recipe_id": "spectrum:pedestal/tier2/runes/amethyst_chiseled_calcite_from_shards" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier2/runes/amethyst_chiseled_basalt_from_cluster" + }, + { + "type": "spectrum:pedestal_crafting", + "recipe_id": "spectrum:pedestal/tier2/runes/citrine_chiseled_calcite_from_shards" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier2/runes/citrine_chiseled_basalt_from_cluster" + }, + { + "type": "spectrum:pedestal_crafting", + "recipe_id": "spectrum:pedestal/tier2/runes/onyx_chiseled_calcite_from_shards" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster" + }, + { + "type": "spectrum:pedestal_crafting", + "recipe_id": "spectrum:pedestal/tier2/runes/moonstone_chiseled_calcite_from_shards" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier2/runes/moonstone_chiseled_basalt_from_cluster" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_chimes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_chimes.json index 7bc348416f..0130412e49 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_chimes.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_chimes.json @@ -19,8 +19,8 @@ ], "background_u_index": 0, "background_v_index": 0, - "x": 3, - "y": 0, + "x": 1, + "y": 1, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json index e692299ff0..49eff48397 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_deco.json @@ -5,7 +5,7 @@ "advancement_id": "spectrum:place_pedestal" }, "icon": { - "item": "spectrum:polished_citrine" + "item": "spectrum:chiseled_citrine" }, "category": "spectrum:decoration", "hide_while_locked": true, @@ -16,8 +16,8 @@ ], "background_u_index": 0, "background_v_index": 0, - "x": -1, - "y": 1, + "x": -2, + "y": 3, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_glass.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_glass.json index 53972bfac1..0695991e93 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_glass.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_glass.json @@ -16,8 +16,8 @@ ], "background_u_index": 0, "background_v_index": 0, - "x": -2, - "y": 0, + "x": -3, + "y": 2, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_lights.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_lights.json index 345e325778..6a53143847 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_lights.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_lights.json @@ -15,14 +15,13 @@ "line_reversed": true }, { - "entry": "spectrum:decoration/block_variants", - "line_reversed": true + "entry": "spectrum:decoration/block_variants" } ], "background_u_index": 0, "background_v_index": 0, "x": 2, - "y": -1, + "y": 2, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/pylons.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_pylons.json similarity index 98% rename from src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/pylons.json rename to src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_pylons.json index 245c042256..93a374e3db 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/pylons.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_pylons.json @@ -16,8 +16,8 @@ ], "background_u_index": 0, "background_v_index": 0, - "x": -1, - "y": -1, + "x": -2, + "y": 1, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_runes.json deleted file mode 100644 index 26dbeced81..0000000000 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/gemstone_runes.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "book.spectrum.guidebook.gemstone_runes.name", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:create_onyx_shard" - }, - "icon": { - "item": "spectrum:citrine_chiseled_calcite" - }, - "category": "spectrum:decoration", - "hide_while_locked": true, - "parents": [ - { - "entry": "spectrum:decoration/shards", - "line_reversed": true - }, - { - "entry": "spectrum:decoration/block_variants" - } - ], - "background_u_index": 0, - "background_v_index": 0, - "x": 2, - "y": 2, - "pages": [ - { - "type": "modonomicon:text", - "text": "book.spectrum.guidebook.gemstone_runes.page0.text", - "title": "book.spectrum.guidebook.gemstone_runes.name" - }, - { - "type": "spectrum:pedestal_crafting", - "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier1/runes/topaz_chiseled_basalt_from_shards", - "text": "book.spectrum.guidebook.gemstone_runes.page1.text" - }, - { - "type": "spectrum:pedestal_crafting", - "title": "book.spectrum.guidebook.gemstone_runes.page2.title", - "recipe_id": "spectrum:pedestal/tier1/runes/topaz_chiseled_basalt_from_cluster", - "text": "book.spectrum.guidebook.gemstone_runes.page2.text" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json new file mode 100644 index 0000000000..39d194db5a --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json @@ -0,0 +1,36 @@ +{ + "name": "book.spectrum.guidebook.lategame_runes.name", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:lategame/collect_moonstone" + }, + "icon": { + "item": "spectrum:moonstone_engraved_calcite" + }, + "category": "spectrum:decoration", + "hide_while_locked": true, + "parents": [ + { + "entry": "spectrum:decoration/midgame_runes", + "line_reversed": true + } + ], + "background_u_index": 0, + "background_v_index": 0, + "x": 2, + "y": -3, + "pages": [ + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.lategame_runes.name", + "recipe_id": "spectrum:pedestal/tier4/runes/moonstone_engraved_calcite_from_shards", + "text": "book.spectrum.guidebook.lategame_runes.about.text" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier4/runes/moonstone_engraved_basalt_from_cluster", + "text": "book.spectrum.guidebook.lategame_runes.flavor.text" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json new file mode 100644 index 0000000000..95a9c75514 --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json @@ -0,0 +1,36 @@ +{ + "name": "book.spectrum.guidebook.midgame_runes.name", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/build_advanced_pedestal_structure" + }, + "icon": { + "item": "spectrum:onyx_engraved_calcite" + }, + "category": "spectrum:decoration", + "hide_while_locked": true, + "parents": [ + { + "entry": "spectrum:decoration/earlygame_runes", + "line_reversed": true + } + ], + "background_u_index": 0, + "background_v_index": 0, + "x": 2, + "y": -2, + "pages": [ + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.midgame_runes.name", + "recipe_id": "spectrum:pedestal/tier3/runes/onyx_engraved_calcite_from_shards", + "text": "book.spectrum.guidebook.midgame_runes.about.text" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "book.spectrum.guidebook.earlygame_runes.page2.title", + "recipe_id": "spectrum:pedestal/tier3/runes/onyx_engraved_basalt_from_cluster", + "text": "book.spectrum.guidebook.midgame_runes.flavor.text" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/resplendent_deco.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/resplendent_deco.json index d392c9dd98..eac9fb7d65 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/resplendent_deco.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/resplendent_deco.json @@ -12,8 +12,8 @@ "parents": [], "background_u_index": 0, "background_v_index": 0, - "x": 4, - "y": -3, + "x": 7, + "y": -2, "pages": [ { "type": "modonomicon:text", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/shards.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/shards.json index 5d5d5fcadc..2e1ee4b17d 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/shards.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/shards.json @@ -13,6 +13,6 @@ "hide_while_locked": true, "background_u_index": 0, "background_v_index": 4, - "x": 0, - "y": 0 + "x": -1, + "y": 2 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/pedestal_upgrade_moonstone.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/pedestal_upgrade_moonstone.json index dbac5c3e7c..3a4fcaa713 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/pedestal_upgrade_moonstone.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/pedestal_upgrade_moonstone.json @@ -29,7 +29,7 @@ { "type": "modonomicon:multiblock", "multiblock_name": "multiblock.spectrum.pedestal_complex", - "multiblock_id": "spectrum:pedestal_complex_without_moonstone", + "multiblock_id": "spectrum:pedestal_complex_without_engravings", "show_visualize_button": true, "text": "book.spectrum.guidebook.pedestal_upgrade_moonstone.dimensions" }, diff --git a/src/main/resources/data/spectrum/modonomicon/multiblocks/pedestal_complex_without_moonstone.json b/src/main/resources/data/spectrum/modonomicon/multiblocks/pedestal_complex_without_engravings.json similarity index 100% rename from src/main/resources/data/spectrum/modonomicon/multiblocks/pedestal_complex_without_moonstone.json rename to src/main/resources/data/spectrum/modonomicon/multiblocks/pedestal_complex_without_engravings.json From 730ac15f1e9d625180c51c96306f4931021118e8 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 19:19:46 +0100 Subject: [PATCH 13/16] onyx / moonstone chiseled rune recipes --- .../runes/moonstone_chiseled_basalt_from_cluster.json | 0 .../runes/moonstone_chiseled_basalt_from_shards.json | 0 .../runes/moonstone_chiseled_calcite_from_cluster.json | 0 .../runes/moonstone_chiseled_calcite_from_shards.json | 0 .../{tier1 => tier2}/runes/onyx_chiseled_basalt_from_cluster.json | 0 .../{tier1 => tier2}/runes/onyx_chiseled_basalt_from_shards.json | 0 .../runes/onyx_chiseled_calcite_from_cluster.json | 0 .../{tier1 => tier2}/runes/onyx_chiseled_calcite_from_shards.json | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/moonstone_chiseled_basalt_from_cluster.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/moonstone_chiseled_basalt_from_shards.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/moonstone_chiseled_calcite_from_cluster.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/moonstone_chiseled_calcite_from_shards.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/onyx_chiseled_basalt_from_cluster.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/onyx_chiseled_basalt_from_shards.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/onyx_chiseled_calcite_from_cluster.json (100%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/onyx_chiseled_calcite_from_shards.json (100%) diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_basalt_from_cluster.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_basalt_from_cluster.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_basalt_from_shards.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_basalt_from_shards.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_calcite_from_cluster.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_calcite_from_cluster.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_calcite_from_shards.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_chiseled_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/moonstone_chiseled_calcite_from_shards.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json similarity index 100% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_chiseled_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json From b11562b821e0e8f70439e2a900edf8c310271642 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 19:21:22 +0100 Subject: [PATCH 14/16] earlygame runes now unlock with the first pedestal structure --- .../runes/amethyst_chiseled_basalt_from_cluster.json | 4 ++-- .../runes/amethyst_chiseled_basalt_from_shards.json | 4 ++-- .../runes/amethyst_chiseled_calcite_from_cluster.json | 4 ++-- .../runes/amethyst_chiseled_calcite_from_shards.json | 4 ++-- .../runes/citrine_chiseled_basalt_from_cluster.json | 4 ++-- .../runes/citrine_chiseled_basalt_from_shards.json | 4 ++-- .../runes/citrine_chiseled_calcite_from_cluster.json | 4 ++-- .../runes/citrine_chiseled_calcite_from_shards.json | 4 ++-- .../tier2/runes/onyx_chiseled_basalt_from_cluster.json | 2 +- .../tier2/runes/onyx_chiseled_basalt_from_shards.json | 2 +- .../tier2/runes/onyx_chiseled_calcite_from_cluster.json | 2 +- .../tier2/runes/onyx_chiseled_calcite_from_shards.json | 2 +- .../runes/topaz_chiseled_basalt_from_cluster.json | 4 ++-- .../runes/topaz_chiseled_basalt_from_shards.json | 4 ++-- .../runes/topaz_chiseled_calcite_from_cluster.json | 4 ++-- .../runes/topaz_chiseled_calcite_from_shards.json | 4 ++-- 16 files changed, 28 insertions(+), 28 deletions(-) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/amethyst_chiseled_basalt_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/amethyst_chiseled_basalt_from_shards.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/amethyst_chiseled_calcite_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/amethyst_chiseled_calcite_from_shards.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/citrine_chiseled_basalt_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/citrine_chiseled_basalt_from_shards.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/citrine_chiseled_calcite_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/citrine_chiseled_calcite_from_shards.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/topaz_chiseled_basalt_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/topaz_chiseled_basalt_from_shards.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/topaz_chiseled_calcite_from_cluster.json (84%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier2}/runes/topaz_chiseled_calcite_from_shards.json (84%) diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_cluster.json index 4139d8ec36..3af46703e2 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 4, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:amethyst_chiseled_basalt", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_shards.json index 9ea0300c73..01e8ff820f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_basalt_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 1, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:amethyst_chiseled_basalt", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_cluster.json index 6d32d6e61a..f3bb14e60a 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 4, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:amethyst_chiseled_calcite", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_shards.json index dd22b7f21e..cd180e6904 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/amethyst_chiseled_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/amethyst_chiseled_calcite_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 1, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:amethyst_chiseled_calcite", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_cluster.json index e4c3c23cf1..2ff45bc05f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 4, @@ -24,5 +24,5 @@ "id": "spectrum:citrine_chiseled_basalt", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_shards.json index e3ef19457e..b875804a89 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_basalt_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 1, @@ -24,5 +24,5 @@ "id": "spectrum:citrine_chiseled_basalt", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_cluster.json index c031e762c3..de0dfa251f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 4, @@ -24,5 +24,5 @@ "id": "spectrum:citrine_chiseled_calcite", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_shards.json index 330b22f9bf..399e78bc3a 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/citrine_chiseled_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/citrine_chiseled_calcite_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 1, @@ -24,5 +24,5 @@ "id": "spectrum:citrine_chiseled_calcite", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json index 0fd7dcdb1c..b859a4650d 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_cluster.json @@ -24,5 +24,5 @@ "id": "spectrum:onyx_chiseled_basalt", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json index 0f6bf01cf1..0f8d3b2430 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_basalt_from_shards.json @@ -24,5 +24,5 @@ "id": "spectrum:onyx_chiseled_basalt", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json index e1bedab8ec..2ddb7bbc1f 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_cluster.json @@ -24,5 +24,5 @@ "id": "spectrum:onyx_chiseled_calcite", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json index 361f8758e9..f58ae91864 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/onyx_chiseled_calcite_from_shards.json @@ -24,5 +24,5 @@ "id": "spectrum:onyx_chiseled_calcite", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_cluster.json index 9afb091962..ea6a1b5d6e 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:topaz_chiseled_basalt", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_shards.json index fc22bd21b2..1ce2ae0dc4 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_basalt_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:topaz_chiseled_basalt", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_cluster.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_cluster.json index 7bb6ece0a7..3f79226803 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_cluster.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:topaz_chiseled_calcite", "count": 8 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_shards.json similarity index 84% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_shards.json index 0a1e7e2136..364811fb14 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/topaz_chiseled_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier2/runes/topaz_chiseled_calcite_from_shards.json @@ -2,7 +2,7 @@ "type": "spectrum:pedestal", "group": "gemstone_chiseled_blocks", "time": 80, - "tier": "basic", + "tier": "simple", "colors": { "spectrum:magenta": 0, "spectrum:yellow": 0, @@ -24,5 +24,5 @@ "id": "spectrum:topaz_chiseled_calcite", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:build_basic_pedestal_structure" } \ No newline at end of file From d11a411c1a3712b7577f26422125210de5a6ebe2 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 19:59:09 +0100 Subject: [PATCH 15/16] engraved recipes: fin~ --- .../resources/assets/spectrum/lang/en_us.json | 2 +- .../entries/decoration/lategame_runes.json | 2 +- .../entries/decoration/midgame_runes.json | 2 +- .../onyx_engraved_basalt_from_cluster.json | 28 ------------------- .../onyx_engraved_calcite_from_cluster.json | 28 ------------------- .../onyx_engraved_basalt_from_blocks.json} | 14 ++++------ .../onyx_engraved_basalt_from_cluster.json | 25 +++++++++++++++++ .../onyx_engraved_calcite_from_blocks.json} | 14 ++++------ .../onyx_engraved_calcite_from_cluster.json | 25 +++++++++++++++++ ...oonstone_engraved_basalt_from_blocks.json} | 14 ++++------ ...oonstone_engraved_basalt_from_cluster.json | 13 ++++----- ...onstone_engraved_calcite_from_blocks.json} | 14 ++++------ ...onstone_engraved_calcite_from_cluster.json | 13 ++++----- 13 files changed, 83 insertions(+), 111 deletions(-) delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_cluster.json delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_cluster.json rename src/main/resources/data/spectrum/recipe/pedestal/{tier1/runes/onyx_engraved_basalt_from_shards.json => tier3/runes/onyx_engraved_basalt_from_blocks.json} (51%) create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_cluster.json rename src/main/resources/data/spectrum/recipe/pedestal/{tier1/runes/onyx_engraved_calcite_from_shards.json => tier3/runes/onyx_engraved_calcite_from_blocks.json} (51%) create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_cluster.json rename src/main/resources/data/spectrum/recipe/pedestal/{tier1/runes/moonstone_engraved_basalt_from_shards.json => tier4/runes/moonstone_engraved_basalt_from_blocks.json} (62%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier4}/runes/moonstone_engraved_basalt_from_cluster.json (63%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1/runes/moonstone_engraved_calcite_from_shards.json => tier4/runes/moonstone_engraved_calcite_from_blocks.json} (62%) rename src/main/resources/data/spectrum/recipe/pedestal/{tier1 => tier4}/runes/moonstone_engraved_calcite_from_cluster.json (63%) diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index d9ea08622d..d763d47af0 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -2876,7 +2876,7 @@ "book.spectrum.guidebook.midgame_runes.about.text": "Energy pulsates through these stones.", "book.spectrum.guidebook.midgame_runes.flavor.text": "*When something needs a bit more oomph (both visually and functionally).*", "book.spectrum.guidebook.lategame_runes.name": "Moonstone Engraved Blocks", - "book.spectrum.guidebook.lategame_runes.about.text": "I can't even get started here without a good amount of moonstone powder.", + "book.spectrum.guidebook.lategame_runes.about.text": "I can't even get started here without a good amount of [](item://spectrum:moonstone_powder).", "book.spectrum.guidebook.lategame_runes.flavor.text": "*Just standing on one of these gives me goosebumps.*", "book.spectrum.guidebook.gemstone_deco.name": "Gemstone Decorations", "book.spectrum.guidebook.gemstone_deco.page0.text": "The gems have an exceptionally beautiful appearance.\\\nHowever, the look of the raw clusters, as I know them from the geodes, seems a little too natural for my edgier builds. As a full block, however, they are beautiful too and fit right in.\\\n\\\nIf I run out of gems at some point, I can easily break the polished ones up again.", diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json index 39d194db5a..58b34a36e9 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/lategame_runes.json @@ -23,7 +23,7 @@ { "type": "spectrum:pedestal_crafting", "title": "book.spectrum.guidebook.lategame_runes.name", - "recipe_id": "spectrum:pedestal/tier4/runes/moonstone_engraved_calcite_from_shards", + "recipe_id": "spectrum:pedestal/tier4/runes/moonstone_engraved_calcite_from_blocks", "text": "book.spectrum.guidebook.lategame_runes.about.text" }, { diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json index 95a9c75514..ae374f8ab4 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/decoration/midgame_runes.json @@ -23,7 +23,7 @@ { "type": "spectrum:pedestal_crafting", "title": "book.spectrum.guidebook.midgame_runes.name", - "recipe_id": "spectrum:pedestal/tier3/runes/onyx_engraved_calcite_from_shards", + "recipe_id": "spectrum:pedestal/tier3/runes/onyx_engraved_calcite_from_blocks", "text": "book.spectrum.guidebook.midgame_runes.about.text" }, { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_cluster.json deleted file mode 100644 index d2aec35131..0000000000 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_cluster.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, - "tier": "advanced", - "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 4, - "spectrum:white": 0 - }, - "experience": 1.0, - "pattern": [ - "WWW", - "WXW", - "WWW" - ], - "key": { - "W": "spectrum:polished_basalt", - "X": "spectrum:onyx_cluster" - }, - "result": { - "id": "spectrum:onyx_engraved_basalt", - "count": 8 - }, - "required_advancement": "spectrum:create_onyx_shard" -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_cluster.json deleted file mode 100644 index d5899549d6..0000000000 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_cluster.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, - "tier": "advanced", - "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 4, - "spectrum:white": 0 - }, - "experience": 1.0, - "pattern": [ - "WWW", - "WXW", - "WWW" - ], - "key": { - "W": "spectrum:polished_calcite", - "X": "spectrum:onyx_cluster" - }, - "result": { - "id": "spectrum:onyx_engraved_calcite", - "count": 8 - }, - "required_advancement": "spectrum:create_onyx_shard" -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_blocks.json similarity index 51% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_blocks.json index b4175a9d53..d6a6d1eff2 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_blocks.json @@ -1,14 +1,10 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "onyx_engraved_blocks", + "time": 160, "tier": "advanced", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 1, - "spectrum:white": 0 + "spectrum:black": 1 }, "experience": 1.0, "pattern": [ @@ -18,11 +14,11 @@ ], "key": { "W": "spectrum:polished_basalt", - "X": "spectrum:onyx_shard" + "X": "spectrum:onyx_block" }, "result": { "id": "spectrum:onyx_engraved_basalt", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:midgame/build_advanced_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_cluster.json new file mode 100644 index 0000000000..3233228623 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_basalt_from_cluster.json @@ -0,0 +1,25 @@ +{ + "type": "spectrum:pedestal", + "group": "onyx_engraved_blocks", + "time": 160, + "tier": "advanced", + "colors": { + "spectrum:black": 4 + }, + "experience": 1.0, + "pattern": [ + "WXW", + "XCX", + "WXW" + ], + "key": { + "W": "spectrum:polished_basalt", + "X": "spectrum:onyx_block", + "C": "spectrum:onyx_cluster" + }, + "result": { + "id": "spectrum:onyx_engraved_basalt", + "count": 8 + }, + "required_advancement": "spectrum:midgame/build_advanced_pedestal_structure" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_blocks.json similarity index 51% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_blocks.json index 8fec0fa890..be865ba900 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/onyx_engraved_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_blocks.json @@ -1,14 +1,10 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "onyx_engraved_blocks", + "time": 160, "tier": "advanced", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 1, - "spectrum:white": 0 + "spectrum:black": 1 }, "experience": 1.0, "pattern": [ @@ -18,11 +14,11 @@ ], "key": { "W": "spectrum:polished_calcite", - "X": "spectrum:onyx_shard" + "X": "spectrum:onyx_block" }, "result": { "id": "spectrum:onyx_engraved_calcite", "count": 1 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:midgame/build_advanced_pedestal_structure" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_cluster.json new file mode 100644 index 0000000000..60acda5039 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier3/runes/onyx_engraved_calcite_from_cluster.json @@ -0,0 +1,25 @@ +{ + "type": "spectrum:pedestal", + "group": "onyx_engraved_blocks", + "time": 160, + "tier": "advanced", + "colors": { + "spectrum:black": 4 + }, + "experience": 1.0, + "pattern": [ + "WXW", + "XCX", + "WXW" + ], + "key": { + "W": "spectrum:polished_calcite", + "X": "spectrum:onyx_block", + "C": "spectrum:onyx_cluster" + }, + "result": { + "id": "spectrum:onyx_engraved_calcite", + "count": 8 + }, + "required_advancement": "spectrum:midgame/build_advanced_pedestal_structure" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_blocks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_blocks.json index fe51866668..1e3d6a4149 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_blocks.json @@ -1,24 +1,20 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "moonstone_engraved_blocks", + "time": 320, "tier": "complex", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 0, "spectrum:white": 1 }, "experience": 1.0, "pattern": [ - "WXW", + "WWW", "XXX", - "WXW" + "WWW" ], "key": { "W": "spectrum:polished_basalt", - "X": "spectrum:moonstone_shard" + "X": "spectrum:moonstone_block" }, "result": { "id": "spectrum:moonstone_engraved_basalt", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_cluster.json similarity index 63% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_cluster.json index dbaa0a1dd1..5e968df8d2 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_basalt_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_basalt_from_cluster.json @@ -1,24 +1,21 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "moonstone_engraved_blocks", + "time": 320, "tier": "complex", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 0, "spectrum:white": 4 }, "experience": 1.0, "pattern": [ "WWW", - "WXW", + "XCX", "WWW" ], "key": { "W": "spectrum:polished_basalt", - "X": "spectrum:moonstone_cluster" + "X": "spectrum:moonstone_block", + "C": "spectrum:moonstone_cluster" }, "result": { "id": "spectrum:moonstone_engraved_basalt", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_shards.json b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_blocks.json similarity index 62% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_shards.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_blocks.json index 740b410f35..879a6377f8 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_shards.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_blocks.json @@ -1,24 +1,20 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "moonstone_engraved_blocks", + "time": 320, "tier": "complex", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 0, "spectrum:white": 1 }, "experience": 1.0, "pattern": [ - "WXW", + "WWW", "XXX", - "WXW" + "WWW" ], "key": { "W": "spectrum:polished_calcite", - "X": "spectrum:moonstone_shard" + "X": "spectrum:moonstone_block" }, "result": { "id": "spectrum:moonstone_engraved_calcite", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_cluster.json b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_cluster.json similarity index 63% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_cluster.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_cluster.json index 0be5000fc9..ff198ceae0 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/runes/moonstone_engraved_calcite_from_cluster.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier4/runes/moonstone_engraved_calcite_from_cluster.json @@ -1,24 +1,21 @@ { "type": "spectrum:pedestal", - "group": "gemstone_chiseled_blocks", - "time": 80, + "group": "moonstone_engraved_blocks", + "time": 320, "tier": "complex", "colors": { - "spectrum:magenta": 0, - "spectrum:yellow": 0, - "spectrum:cyan": 0, - "spectrum:black": 0, "spectrum:white": 4 }, "experience": 1.0, "pattern": [ "WWW", - "WXW", + "XCX", "WWW" ], "key": { "W": "spectrum:polished_calcite", - "X": "spectrum:moonstone_cluster" + "X": "spectrum:moonstone_block", + "C": "spectrum:moonstone_cluster" }, "result": { "id": "spectrum:moonstone_engraved_calcite", From 508a245262b6007812c63bd4e8b9e8e9ddfb30fb Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 25 Oct 2026 20:02:03 +0100 Subject: [PATCH 16/16] onyx & moonstone chiseled loot in moonstone temple --- .../chests/city_below/moonstone_temple_roof_ridge.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_roof_ridge.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_roof_ridge.json index bf6ae0a08b..10f7a91d34 100644 --- a/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_roof_ridge.json +++ b/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_roof_ridge.json @@ -31,6 +31,14 @@ "type": "minecraft:item", "name": "spectrum:amethyst_chiseled_basalt" }, + { + "type": "minecraft:item", + "name": "spectrum:onyx_chiseled_basalt" + }, + { + "type": "minecraft:item", + "name": "spectrum:moonstone_chiseled_basalt" + }, { "type": "minecraft:item", "name": "spectrum:chiseled_polished_basalt",