From b09490243cc953db2168eba130abb80393615873 Mon Sep 17 00:00:00 2001 From: gniftygnome Date: Mon, 11 Nov 2024 16:44:45 -0800 Subject: [PATCH] Update to Minecraft 1.21.2/3. - Update to Minecraft 1.21.2/3 - Fix missing "darker" trim materials - Fix use of vanilla music in Cinderscapes biomes * Remove unused models left over from incomplete new biomes * Reorg lang files for consistency * Follow Terraform boat API changes * Drop unused TerraBlender support files --- build.gradle | 5 - .../assets/cinderscapes/lang/en_gb.json | 6 +- .../assets/cinderscapes/lang/en_us.json | 298 +++++++---- .../assets/cinderscapes/lang/es_ar.json | 253 +++++---- .../assets/cinderscapes/lang/es_es.json | 253 +++++---- .../assets/cinderscapes/lang/es_mx.json | 253 +++++---- .../assets/cinderscapes/lang/fr_fr.json | 251 +++++---- .../assets/cinderscapes/lang/pl_pl.json | 251 +++++---- .../assets/cinderscapes/lang/pt_br.json | 253 +++++---- .../assets/cinderscapes/lang/ru_ru.json | 268 ++++++---- .../assets/cinderscapes/lang/uk_ua.json | 266 ++++++---- .../assets/cinderscapes/lang/zh_cn.json | 253 +++++---- .../models/block/radiant_roots.json | 6 - .../models/block/radiant_slate.json | 6 - .../models/block/withered_fungus.json | 6 - .../models/block/withered_nylium.json | 8 - .../models/block/withered_stem.json | 7 - .../models/block/withered_wart_block.json | 6 - .../models/item/radiant_roots.json | 6 - .../models/item/radiant_slate.json | 3 - .../models/item/withered_fungus.json | 6 - .../models/item/withered_nylium.json | 3 - .../models/item/withered_stem.json | 3 - .../models/item/withered_wart_block.json | 3 - .../resources/assets/cinderscapes/sounds.json | 39 +- .../assets/minecraft/atlases/armor_trims.json | 68 +-- .../minecraft/models/item/diamond_boots.json | 6 + .../models/item/diamond_chestplate.json | 6 + .../minecraft/models/item/diamond_helmet.json | 6 + .../models/item/diamond_leggings.json | 6 + .../minecraft/models/item/golden_boots.json | 6 + .../models/item/golden_chestplate.json | 6 + .../minecraft/models/item/golden_helmet.json | 6 + .../models/item/golden_leggings.json | 6 + .../minecraft/models/item/iron_boots.json | 6 + .../models/item/iron_chestplate.json | 6 + .../minecraft/models/item/iron_helmet.json | 6 + .../minecraft/models/item/iron_leggings.json | 6 + .../models/item/netherite_boots.json | 6 + .../models/item/netherite_chestplate.json | 6 + .../models/item/netherite_helmet.json | 6 + .../models/item/netherite_leggings.json | 6 + .../cinderscapes/Cinderscapes.java | 6 +- .../cinderscapes/biome/AshyShoalsBiome.java | 2 +- .../biome/BlackstoneShalesBiome.java | 2 +- .../biome/LuminousGroveBiome.java | 2 +- .../cinderscapes/biome/QuartzCavernBiome.java | 2 +- .../block/BrambleBerryBushBlock.java | 7 +- .../block/CinderscapesNetherPlantBlock.java | 3 +- .../CinderscapesNetherTallPlantBlock.java | 3 +- .../cinderscapes/block/CrystiniumBlock.java | 11 +- .../block/GhastlyEctoplasmBlock.java | 8 +- .../cinderscapes/block/PhotofernBlock.java | 10 +- .../block/PolypiteQuartzBlock.java | 6 +- .../block/PottedCrystiniumBlock.java | 6 +- .../block/PottedPyracinthBlock.java | 6 +- .../cinderscapes/block/PyracinthBlock.java | 11 +- .../CinderscapesBlockLootTableProvider.java | 13 +- .../data/CinderscapesBlockTagProvider.java | 2 +- .../CinderscapesDynamicRegistryProvider.java | 8 +- .../data/CinderscapesItemTagProvider.java | 7 +- .../data/CinderscapesRecipeProvider.java | 496 +++++++++--------- .../feature/AshTopLayerFeature.java | 2 +- .../init/CinderscapesArmorTrimMaterials.java | 4 +- .../cinderscapes/init/CinderscapesBlocks.java | 218 ++++---- .../cinderscapes/init/CinderscapesItems.java | 22 +- .../init/CinderscapesSoundEvents.java | 23 +- .../init/helpers/CinderscapesRegistry.java | 28 +- .../cinderscapes/mixin/MixinServerWorld.java | 8 +- .../tag/CinderscapesBlockTags.java | 2 +- .../tag/CinderscapesItemTags.java | 2 +- .../cinderscapes-common.accesswidener | 4 +- gradle.properties | 32 +- src/main/resources/fabric.mod.json | 2 +- worldgen/build.gradle | 3 +- .../CinderscapesTerraBlenderGeneration.java | 63 --- .../LuminousGroveSurfaceBuilder.java | 3 +- worldgen/src/main/resources/fabric.mod.json | 2 +- 78 files changed, 2308 insertions(+), 1597 deletions(-) delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/radiant_roots.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/radiant_slate.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/withered_fungus.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/withered_nylium.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/withered_stem.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/block/withered_wart_block.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/radiant_roots.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/radiant_slate.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/withered_fungus.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/withered_nylium.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/withered_stem.json delete mode 100644 client/src/main/resources/assets/cinderscapes/models/item/withered_wart_block.json delete mode 100644 worldgen/src/main/java/com/terraformersmc/cinderscapes/biomegen/CinderscapesTerraBlenderGeneration.java diff --git a/build.gradle b/build.gradle index 2523833b..c73439a6 100644 --- a/build.gradle +++ b/build.gradle @@ -93,11 +93,6 @@ allprojects { url = 'https://maven.terraformersmc.com/' } - // TerraBlender - maven { - url = 'https://maven.minecraftforge.net/' - } - // Cloth Config maven { url = "https://maven.shedaniel.me" diff --git a/client/src/main/resources/assets/cinderscapes/lang/en_gb.json b/client/src/main/resources/assets/cinderscapes/lang/en_gb.json index 4bc7df9a..c79cfe39 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/en_gb.json +++ b/client/src/main/resources/assets/cinderscapes/lang/en_gb.json @@ -1,5 +1,9 @@ { "block.cinderscapes.chiseled_sulfur_quartz_block": "Chiselled Sulfur Quartz Block", "block.cinderscapes.chiseled_rose_quartz_block": "Chiselled Rose Quartz Block", - "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block" + "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block", + + "item.cinderscapes.chiseled_sulfur_quartz_block": "Chiselled Sulfur Quartz Block", + "item.cinderscapes.chiseled_rose_quartz_block": "Chiselled Rose Quartz Block", + "item.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block" } diff --git a/client/src/main/resources/assets/cinderscapes/lang/en_us.json b/client/src/main/resources/assets/cinderscapes/lang/en_us.json index 5deaa73d..e7b2a1f9 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/en_us.json +++ b/client/src/main/resources/assets/cinderscapes/lang/en_us.json @@ -1,26 +1,81 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Sulfur Ore", - "block.cinderscapes.sulfur_block": "Sulfur Block", - "item.cinderscapes.sulfur": "Sulfur", - - "item.cinderscapes.bramble_berries": "Bramble Berries", - "block.cinderscapes.bramble_berry_bush": "Bramble Berry Bush", - + "biome.cinderscapes.ashy_shoals": "Ashy Shoals", + "biome.cinderscapes.blackstone_shales": "Blackstone Shales", "biome.cinderscapes.luminous_grove": "Luminous Grove", + "biome.cinderscapes.quartz_cavern": "Quartz Cavern", + "block.cinderscapes.ash": "Ash", + "block.cinderscapes.ash_block": "Ash Block", + "block.cinderscapes.bramble_berry_bush": "Bramble Berry Bush", + "block.cinderscapes.chiseled_rose_quartz_block": "Chiseled Rose Quartz Block", + "block.cinderscapes.chiseled_smoky_quartz_block": "Chiseled Smoky Quartz Block", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Chiseled Sulfur Quartz Block", + "block.cinderscapes.crystalline_quartz": "Crystalline Quartz", + "block.cinderscapes.crystalline_rose_quartz": "Crystalline Rose Quartz", + "block.cinderscapes.crystalline_smoky_quartz": "Crystalline Smoky Quartz", + "block.cinderscapes.crystalline_sulfur_quartz": "Crystalline Sulfur Quartz", + "block.cinderscapes.crystinium": "Crystinium", + "block.cinderscapes.ghastly_ectoplasm": "Ghastly Ectoplasm", "block.cinderscapes.luminous_pod": "Luminous Pod", - - "block.cinderscapes.twilight_tendrils": "Twilight Tendrils", - "block.cinderscapes.twilight_fescues": "Twilight Fescues", - "block.cinderscapes.twilight_vine_block": "Twilight Vine Block", - "block.cinderscapes.photofern": "Photofern", - "block.cinderscapes.tall_photofern": "Tall Photofern", - + "block.cinderscapes.polypite_quartz": "Polypite Quartz", + "block.cinderscapes.polypite_rose_quartz": "Polypite Rose Quartz", + "block.cinderscapes.polypite_smoky_quartz": "Polypite Smoky Quartz", + "block.cinderscapes.polypite_sulfur_quartz": "Polypite Sulfur Quartz", + "block.cinderscapes.pyracinth": "Pyracinth", + "block.cinderscapes.rose_quartz_block": "Rose Quartz Block", + "block.cinderscapes.rose_quartz_bricks": "Rose Quartz Bricks", + "block.cinderscapes.rose_quartz_ore": "Rose Quartz Ore", + "block.cinderscapes.rose_quartz_pillar": "Rose Quartz Pillar", + "block.cinderscapes.rose_quartz_slab": "Rose Quartz Slab", + "block.cinderscapes.rose_quartz_stairs": "Rose Quartz Stairs", + "block.cinderscapes.scorched_button": "Scorched Button", + "block.cinderscapes.scorched_door": "Scorched Door", + "block.cinderscapes.scorched_fence": "Scorched Fence", + "block.cinderscapes.scorched_fence_gate": "Scorched Fence Gate", + "block.cinderscapes.scorched_hanging_sign": "Scorched Hanging Sign", + "block.cinderscapes.scorched_hyphae": "Scorched Hyphae", + "block.cinderscapes.scorched_planks": "Scorched Planks", + "block.cinderscapes.scorched_pressure_plate": "Scorched Pressure Plate", + "block.cinderscapes.scorched_shrub": "Scorched Shrub", + "block.cinderscapes.scorched_sign": "Scorched Sign", + "block.cinderscapes.scorched_slab": "Scorched Slab", + "block.cinderscapes.scorched_sprouts": "Scorched Sprouts", + "block.cinderscapes.scorched_stairs": "Scorched Stairs", + "block.cinderscapes.scorched_stem": "Scorched Stem", + "block.cinderscapes.scorched_tendrils": "Scorched Tendrils", + "block.cinderscapes.scorched_trapdoor": "Scorched Trapdoor", + "block.cinderscapes.smoky_quartz_block": "Smoky Quartz Block", + "block.cinderscapes.smoky_quartz_bricks": "Smoky Quartz Bricks", + "block.cinderscapes.smoky_quartz_ore": "Smoky Quartz Ore", + "block.cinderscapes.smoky_quartz_pillar": "Smoky Quartz Pillar", + "block.cinderscapes.smoky_quartz_slab": "Smoky Quartz Slab", + "block.cinderscapes.smoky_quartz_stairs": "Smoky Quartz Stairs", + "block.cinderscapes.smooth_rose_quartz": "Smooth Rose Quartz", + "block.cinderscapes.smooth_rose_quartz_slab": "Smooth Rose Quartz Slab", + "block.cinderscapes.smooth_rose_quartz_stairs": "Smooth Rose Quartz Stairs", + "block.cinderscapes.smooth_smoky_quartz": "Smooth Smoky Quartz", + "block.cinderscapes.smooth_smoky_quartz_slab": "Smooth Smoky Quartz Slab", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Smooth Smoky Quartz Stairs", + "block.cinderscapes.smooth_sulfur_quartz": "Smooth Sulfur Quartz", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Smooth Sulfur Quartz Slab", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Smooth Sulfur Quartz Stairs", + "block.cinderscapes.stripped_scorched_hyphae": "Stripped Scorched Hyphae", + "block.cinderscapes.stripped_scorched_stem": "Stripped Scorched Stem", "block.cinderscapes.stripped_umbral_hyphae": "Stripped Umbral Hyphae", "block.cinderscapes.stripped_umbral_stem": "Stripped Umbral Stem", + "block.cinderscapes.sulfur_block": "Sulfur Block", + "block.cinderscapes.sulfur_ore": "Sulfur Ore", + "block.cinderscapes.sulfur_quartz_block": "Sulfur Quartz Block", + "block.cinderscapes.sulfur_quartz_bricks": "Sulfur Quartz Bricks", + "block.cinderscapes.sulfur_quartz_ore": "Sulfur Quartz Ore", + "block.cinderscapes.sulfur_quartz_pillar": "Sulfur Quartz Pillar", + "block.cinderscapes.sulfur_quartz_slab": "Sulfur Quartz Slab", + "block.cinderscapes.sulfur_quartz_stairs": "Sulfur Quartz Stairs", + "block.cinderscapes.tall_photofern": "Tall Photofern", + "block.cinderscapes.twilight_fescues": "Twilight Fescues", + "block.cinderscapes.twilight_tendrils": "Twilight Tendrils", + "block.cinderscapes.twilight_vine_block": "Twilight Vine Block", "block.cinderscapes.umbral_button": "Umbral Button", "block.cinderscapes.umbral_door": "Umbral Door", "block.cinderscapes.umbral_fence": "Umbral Fence", @@ -39,91 +94,131 @@ "block.cinderscapes.umbral_trapdoor": "Umbral Trapdoor", "block.cinderscapes.umbral_wart_block": "Umbral Wart Block", - "block.cinderscapes.ghastly_ectoplasm": "Ghastly Ectoplasm", - - "biome.cinderscapes.quartz_cavern": "Quartz Cavern", - - "block.cinderscapes.crystinium": "Crystinium", - - "block.cinderscapes.polypite_quartz": "Polypite Quartz", - "block.cinderscapes.crystalline_quartz": "Crystalline Quartz", + "block.cinderscapes.nodzol": "Nodzol", + "block.cinderscapes.nodzol.description": "This block is nursed...", - "block.cinderscapes.chiseled_sulfur_quartz_block": "Chiseled Sulfur Quartz Block", - "block.cinderscapes.crystalline_sulfur_quartz": "Crystalline Sulfur Quartz", - "block.cinderscapes.polypite_sulfur_quartz": "Polypite Sulfur Quartz", - "block.cinderscapes.smooth_sulfur_quartz": "Smooth Sulfur Quartz", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Smooth Sulfur Quartz Slab", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Smooth Sulfur Quartz Stairs", - "block.cinderscapes.sulfur_quartz_block": "Sulfur Quartz Block", - "block.cinderscapes.sulfur_quartz_bricks": "Sulfur Quartz Bricks", - "block.cinderscapes.sulfur_quartz_ore": "Sulfur Quartz Ore", - "block.cinderscapes.sulfur_quartz_pillar": "Sulfur Quartz Pillar", - "block.cinderscapes.sulfur_quartz_slab": "Sulfur Quartz Slab", - "block.cinderscapes.sulfur_quartz_stairs": "Sulfur Quartz Stairs", - "item.cinderscapes.sulfur_quartz": "Sulfur Quartz", + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Ash Pile", + "item.cinderscapes.bramble_berries": "Bramble Berries", + "item.cinderscapes.sulfur": "Sulfur", - "block.cinderscapes.chiseled_rose_quartz_block": "Chiseled Rose Quartz Block", - "block.cinderscapes.crystalline_rose_quartz": "Crystalline Rose Quartz", - "block.cinderscapes.polypite_rose_quartz": "Polypite Rose Quartz", - "block.cinderscapes.rose_quartz_block": "Rose Quartz Block", - "block.cinderscapes.rose_quartz_bricks": "Rose Quartz Bricks", - "block.cinderscapes.rose_quartz_ore": "Rose Quartz Ore", - "block.cinderscapes.rose_quartz_pillar": "Rose Quartz Pillar", - "block.cinderscapes.rose_quartz_slab": "Rose Quartz Slab", - "block.cinderscapes.rose_quartz_stairs": "Rose Quartz Stairs", - "block.cinderscapes.smooth_rose_quartz": "Smooth Rose Quartz", - "block.cinderscapes.smooth_rose_quartz_slab": "Smooth Rose Quartz Slab", - "block.cinderscapes.smooth_rose_quartz_stairs": "Smooth Rose Quartz Stairs", "item.cinderscapes.rose_quartz": "Rose Quartz", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Chiseled Smoky Quartz Block", - "block.cinderscapes.crystalline_smoky_quartz": "Crystalline Smoky Quartz", - "block.cinderscapes.polypite_smoky_quartz": "Polypite Smoky Quartz", - "block.cinderscapes.smoky_quartz_block": "Smoky Quartz Block", - "block.cinderscapes.smoky_quartz_bricks": "Smoky Quartz Bricks", - "block.cinderscapes.smoky_quartz_ore": "Smoky Quartz Ore", - "block.cinderscapes.smoky_quartz_pillar": "Smoky Quartz Pillar", - "block.cinderscapes.smoky_quartz_slab": "Smoky Quartz Slab", - "block.cinderscapes.smoky_quartz_stairs": "Smoky Quartz Stairs", - "block.cinderscapes.smooth_smoky_quartz": "Smooth Smoky Quartz", - "block.cinderscapes.smooth_smoky_quartz_slab": "Smooth Smoky Quartz Slab", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Smooth Smoky Quartz Stairs", "item.cinderscapes.smoky_quartz": "Smoky Quartz", - - "biome.cinderscapes.blackstone_shales": "Blackstone Shales", - - "biome.cinderscapes.ashy_shoals": "Ashy Shoals", - - "block.cinderscapes.scorched_shrub": "Scorched Shrub", - "block.cinderscapes.scorched_sprouts": "Scorched Sprouts", - "block.cinderscapes.scorched_tendrils": "Scorched Tendrils", - "block.cinderscapes.pyracinth": "Pyracinth", - - "item.cinderscapes.ash_pile": "Ash Pile", - "block.cinderscapes.ash": "Ash", - "block.cinderscapes.ash_block": "Ash Block", - - "block.cinderscapes.scorched_button": "Scorched Button", - "block.cinderscapes.scorched_door": "Scorched Door", - "block.cinderscapes.scorched_fence": "Scorched Fence", - "block.cinderscapes.scorched_fence_gate": "Scorched Fence Gate", - "block.cinderscapes.scorched_hanging_sign": "Scorched Hanging Sign", - "block.cinderscapes.scorched_hyphae": "Scorched Hyphae", - "block.cinderscapes.scorched_planks": "Scorched Planks", - "block.cinderscapes.scorched_pressure_plate": "Scorched Pressure Plate", - "block.cinderscapes.scorched_sign": "Scorched Sign", - "block.cinderscapes.scorched_slab": "Scorched Slab", - "block.cinderscapes.scorched_stairs": "Scorched Stairs", - "block.cinderscapes.scorched_stem": "Scorched Stem", - "block.cinderscapes.scorched_trapdoor": "Scorched Trapdoor", - "block.cinderscapes.stripped_scorched_hyphae": "Stripped Scorched Hyphae", - "block.cinderscapes.stripped_scorched_stem": "Stripped Scorched Stem", + "item.cinderscapes.sulfur_quartz": "Sulfur Quartz", "item.cinderscapes.music_disc_chilling_in_hell": "Music Disc", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Music Disc", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Ash", + "item.cinderscapes.ash_block": "Ash Block", + "item.cinderscapes.chiseled_rose_quartz_block": "Chiseled Rose Quartz Block", + "item.cinderscapes.chiseled_smoky_quartz_block": "Chiseled Smoky Quartz Block", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Chiseled Sulfur Quartz Block", + "item.cinderscapes.crystalline_quartz": "Crystalline Quartz", + "item.cinderscapes.crystalline_rose_quartz": "Crystalline Rose Quartz", + "item.cinderscapes.crystalline_smoky_quartz": "Crystalline Smoky Quartz", + "item.cinderscapes.crystalline_sulfur_quartz": "Crystalline Sulfur Quartz", + "item.cinderscapes.crystinium": "Crystinium", + "item.cinderscapes.ghastly_ectoplasm": "Ghastly Ectoplasm", + "item.cinderscapes.luminous_pod": "Luminous Pod", + "item.cinderscapes.photofern": "Photofern", + "item.cinderscapes.polypite_quartz": "Polypite Quartz", + "item.cinderscapes.polypite_rose_quartz": "Polypite Rose Quartz", + "item.cinderscapes.polypite_smoky_quartz": "Polypite Smoky Quartz", + "item.cinderscapes.polypite_sulfur_quartz": "Polypite Sulfur Quartz", + "item.cinderscapes.pyracinth": "Pyracinth", + "item.cinderscapes.rose_quartz_block": "Rose Quartz Block", + "item.cinderscapes.rose_quartz_bricks": "Rose Quartz Bricks", + "item.cinderscapes.rose_quartz_ore": "Rose Quartz Ore", + "item.cinderscapes.rose_quartz_pillar": "Rose Quartz Pillar", + "item.cinderscapes.rose_quartz_slab": "Rose Quartz Slab", + "item.cinderscapes.rose_quartz_stairs": "Rose Quartz Stairs", + "item.cinderscapes.scorched_button": "Scorched Button", + "item.cinderscapes.scorched_door": "Scorched Door", + "item.cinderscapes.scorched_fence": "Scorched Fence", + "item.cinderscapes.scorched_fence_gate": "Scorched Fence Gate", + "item.cinderscapes.scorched_hanging_sign": "Scorched Hanging Sign", + "item.cinderscapes.scorched_hyphae": "Scorched Hyphae", + "item.cinderscapes.scorched_planks": "Scorched Planks", + "item.cinderscapes.scorched_pressure_plate": "Scorched Pressure Plate", + "item.cinderscapes.scorched_shrub": "Scorched Shrub", + "item.cinderscapes.scorched_sign": "Scorched Sign", + "item.cinderscapes.scorched_slab": "Scorched Slab", + "item.cinderscapes.scorched_sprouts": "Scorched Sprouts", + "item.cinderscapes.scorched_stairs": "Scorched Stairs", + "item.cinderscapes.scorched_stem": "Scorched Stem", + "item.cinderscapes.scorched_tendrils": "Scorched Tendrils", + "item.cinderscapes.scorched_trapdoor": "Scorched Trapdoor", + "item.cinderscapes.smoky_quartz_block": "Smoky Quartz Block", + "item.cinderscapes.smoky_quartz_bricks": "Smoky Quartz Bricks", + "item.cinderscapes.smoky_quartz_ore": "Smoky Quartz Ore", + "item.cinderscapes.smoky_quartz_pillar": "Smoky Quartz Pillar", + "item.cinderscapes.smoky_quartz_slab": "Smoky Quartz Slab", + "item.cinderscapes.smoky_quartz_stairs": "Smoky Quartz Stairs", + "item.cinderscapes.smooth_rose_quartz": "Smooth Rose Quartz", + "item.cinderscapes.smooth_rose_quartz_slab": "Smooth Rose Quartz Slab", + "item.cinderscapes.smooth_rose_quartz_stairs": "Smooth Rose Quartz Stairs", + "item.cinderscapes.smooth_smoky_quartz": "Smooth Smoky Quartz", + "item.cinderscapes.smooth_smoky_quartz_slab": "Smooth Smoky Quartz Slab", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Smooth Smoky Quartz Stairs", + "item.cinderscapes.smooth_sulfur_quartz": "Smooth Sulfur Quartz", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Smooth Sulfur Quartz Slab", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Smooth Sulfur Quartz Stairs", + "item.cinderscapes.stripped_scorched_hyphae": "Stripped Scorched Hyphae", + "item.cinderscapes.stripped_scorched_stem": "Stripped Scorched Stem", + "item.cinderscapes.stripped_umbral_hyphae": "Stripped Umbral Hyphae", + "item.cinderscapes.stripped_umbral_stem": "Stripped Umbral Stem", + "item.cinderscapes.sulfur_block": "Sulfur Block", + "item.cinderscapes.sulfur_ore": "Sulfur Ore", + "item.cinderscapes.sulfur_quartz_block": "Sulfur Quartz Block", + "item.cinderscapes.sulfur_quartz_bricks": "Sulfur Quartz Bricks", + "item.cinderscapes.sulfur_quartz_ore": "Sulfur Quartz Ore", + "item.cinderscapes.sulfur_quartz_pillar": "Sulfur Quartz Pillar", + "item.cinderscapes.sulfur_quartz_slab": "Sulfur Quartz Slab", + "item.cinderscapes.sulfur_quartz_stairs": "Sulfur Quartz Stairs", + "item.cinderscapes.tall_photofern": "Tall Photofern", + "item.cinderscapes.twilight_fescues": "Twilight Fescues", + "item.cinderscapes.twilight_tendrils": "Twilight Tendrils", + "item.cinderscapes.twilight_vine_block": "Twilight Vine Block", + "item.cinderscapes.umbral_button": "Umbral Button", + "item.cinderscapes.umbral_door": "Umbral Door", + "item.cinderscapes.umbral_fence": "Umbral Fence", + "item.cinderscapes.umbral_fence_gate": "Umbral Fence Gate", + "item.cinderscapes.umbral_flesh_block": "Umbral Flesh Block", + "item.cinderscapes.umbral_fungus": "Umbral Fungus", + "item.cinderscapes.umbral_hanging_sign": "Umbral Hanging Sign", + "item.cinderscapes.umbral_hyphae": "Umbral Hyphae", + "item.cinderscapes.umbral_nylium": "Umbral Nylium", + "item.cinderscapes.umbral_planks": "Umbral Planks", + "item.cinderscapes.umbral_pressure_plate": "Umbral Pressure Plate", + "item.cinderscapes.umbral_sign": "Umbral Sign", + "item.cinderscapes.umbral_slab": "Umbral Slab", + "item.cinderscapes.umbral_stairs": "Umbral Stairs", + "item.cinderscapes.umbral_stem": "Umbral Stem", + "item.cinderscapes.umbral_trapdoor": "Umbral Trapdoor", + "item.cinderscapes.umbral_wart_block": "Umbral Wart Block", + + "item.cinderscapes.nodzol": "Nodzol", + "item.cinderscapes.nodzol.description": "This block is nursed...", + + "tag.item.c.dark_ashes_dusts": "Dark Ashes Dusts", + "tag.item.c.quartz": "Quartz", + "tag.item.c.quartz_blocks": "Quartz Blocks", + "tag.item.c.storage_blocks.sulfur": "Storage Blocks for Sulfur", + "tag.item.c.stripped_logs": "Stripped Logs", + "tag.item.c.stripped_woods": "Stripped Woods", + "tag.item.c.sulfur_ores": "Sulfur Ores", + "tag.item.c.ores.sulfurs": "Ores of Sulfurs", + "tag.item.c.sulfurs": "Sulfurs", + + "tag.item.cinderscapes.rose_quartz_convertibles": "Rose Quartz Convertibles", + "tag.item.cinderscapes.scorched_stems": "Scorched Stems", + "tag.item.cinderscapes.smoky_quartz_convertibles": "Smoky Quartz Convertibles", + "tag.item.cinderscapes.sulfur_quartz_convertibles": "Sulfur Quartz Convertibles", + "tag.item.cinderscapes.umbral_stems": "Umbral Stems", + "text.autoconfig.cinderscapes.title": "Cinderscapes Config", "text.autoconfig.cinderscapes.option.easterEggs": "Enable Easter Eggs", "text.autoconfig.cinderscapes.option.enableAshFall": "Enable Ash Fall", @@ -139,24 +234,5 @@ "trim_material.cinderscapes.rose_quartz": "Rose Quartz Material", "trim_material.cinderscapes.smoky_quartz": "Smoky Quartz Material", - "trim_material.cinderscapes.sulfur_quartz": "Sulfur Quartz Material", - - "block.cinderscapes.nodzol": "Nodzol", - "block.cinderscapes.nodzol.description": "This block is nursed...", - - "tag.item.c.dark_ashes_dusts": "Dark Ashes Dusts", - "tag.item.c.quartz": "Quartz", - "tag.item.c.quartz_blocks": "Quartz Blocks", - "tag.item.c.storage_blocks.sulfur": "Storage Blocks for Sulfur", - "tag.item.c.stripped_logs": "Stripped Logs", - "tag.item.c.stripped_wood": "Stripped Wood", - "tag.item.c.sulfur_ores": "Sulfur Ores", - "tag.item.c.ores.sulfurs": "Ores of Sulfurs", - "tag.item.c.sulfurs": "Sulfurs", - - "tag.item.cinderscapes.rose_quartz_convertibles": "Rose Quartz Convertibles", - "tag.item.cinderscapes.scorched_stems": "Scorched Stems", - "tag.item.cinderscapes.smoky_quartz_convertibles": "Smoky Quartz Convertibles", - "tag.item.cinderscapes.sulfur_quartz_convertibles": "Sulfur Quartz Convertibles", - "tag.item.cinderscapes.umbral_stems": "Umbral Stems" + "trim_material.cinderscapes.sulfur_quartz": "Sulfur Quartz Material" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_ar.json b/client/src/main/resources/assets/cinderscapes/lang/es_ar.json index 713d1c4f..bae3dfde 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_ar.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_ar.json @@ -1,107 +1,34 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Mineral de azufre", - "block.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur": "Azufre", - - "item.cinderscapes.bramble_berries": "Zarzamora", - "block.cinderscapes.bramble_berry_bush": "Zarza", - + "biome.cinderscapes.ashy_shoals": "Bancos cenizos", + "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", "biome.cinderscapes.luminous_grove": "Arboleda luminosa", - - "block.cinderscapes.luminous_pod": "Vaina luminosa", - - "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "block.cinderscapes.twilight_fescues": "Festuca crepuscular", - "block.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", - - "block.cinderscapes.photofern": "Fotohelecho", - "block.cinderscapes.tall_photofern": "Fotohelecho alto", - - "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "block.cinderscapes.umbral_button": "Botón eclipsado", - "block.cinderscapes.umbral_door": "Puerta eclipsada", - "block.cinderscapes.umbral_fence": "Valla eclipsada", - "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "block.cinderscapes.umbral_fungus": "Hongo eclipsado", - "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "block.cinderscapes.umbral_nylium": "Nilio eclipsado", - "block.cinderscapes.umbral_planks": "Madera eclipsada", - "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "block.cinderscapes.umbral_sign": "Cartel eclipsado", - "block.cinderscapes.umbral_slab": "Baldosa eclipsada", - "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "block.cinderscapes.umbral_stem": "Tallo eclipsado", - "block.cinderscapes.umbral_trapdoor": "Escotilla eclipsada", - "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - - "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "biome.cinderscapes.quartz_cavern": "Caverna de cuarzo", - "block.cinderscapes.crystinium": "Cristinio", - - "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Baldosa de cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_pillar": "Columna de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_slab": "Baldosa de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", - + "block.cinderscapes.ash": "Ceniza", + "block.cinderscapes.ash_block": "Bloque de ceniza", + "block.cinderscapes.bramble_berry_bush": "Zarza", "block.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", "block.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "block.cinderscapes.crystinium": "Cristinio", + "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "block.cinderscapes.luminous_pod": "Vaina luminosa", + "block.cinderscapes.photofern": "Fotohelecho", + "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", "block.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "block.cinderscapes.pyracinth": "Piracinto", "block.cinderscapes.rose_quartz_block": "Cuarzo rosa", "block.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", "block.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", "block.cinderscapes.rose_quartz_pillar": "Columna de cuarzo rosa", "block.cinderscapes.rose_quartz_slab": "Baldosa de cuarzo rosa", "block.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_slab": "Baldosa de cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.rose_quartz": "Cuarzo rosa", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_pillar": "Columna de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_slab": "Baldosa de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_slab": "Baldosa de cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", - - "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", - - "biome.cinderscapes.ashy_shoals": "Bancos cenizos", - - "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "block.cinderscapes.scorched_sprouts": "Brotes chamuscados", - "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "block.cinderscapes.pyracinth": "Piracinto", - - "item.cinderscapes.ash_pile": "Pila de ceniza", - "block.cinderscapes.ash": "Ceniza", - "block.cinderscapes.ash_block": "Bloque de ceniza", - "block.cinderscapes.scorched_button": "Botón chamuscado", "block.cinderscapes.scorched_door": "Puerta chamuscada", "block.cinderscapes.scorched_fence": "Valla chamuscada", @@ -109,19 +36,163 @@ "block.cinderscapes.scorched_hyphae": "Hifas chamuscadas", "block.cinderscapes.scorched_planks": "Madera chamuscada", "block.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", "block.cinderscapes.scorched_sign": "Cartel chamuscado", "block.cinderscapes.scorched_slab": "Baldosa chamuscada", + "block.cinderscapes.scorched_sprouts": "Brotes chamuscados", "block.cinderscapes.scorched_stairs": "Escaleras chamuscada", "block.cinderscapes.scorched_stem": "Tallo chamuscado", + "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", "block.cinderscapes.scorched_trapdoor": "Escotilla chamuscada", + "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_pillar": "Columna de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_slab": "Baldosa de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_slab": "Baldosa de cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_slab": "Baldosa de cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Baldosa de cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", "block.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", "block.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "block.cinderscapes.sulfur_block": "Bloque de azufre", + "block.cinderscapes.sulfur_ore": "Mineral de azufre", + "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_pillar": "Columna de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_slab": "Baldosa de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "block.cinderscapes.tall_photofern": "Fotohelecho alto", + "block.cinderscapes.twilight_fescues": "Festuca crepuscular", + "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "block.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", + "block.cinderscapes.umbral_button": "Botón eclipsado", + "block.cinderscapes.umbral_door": "Puerta eclipsada", + "block.cinderscapes.umbral_fence": "Valla eclipsada", + "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "block.cinderscapes.umbral_fungus": "Hongo eclipsado", + "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "block.cinderscapes.umbral_nylium": "Nilio eclipsado", + "block.cinderscapes.umbral_planks": "Madera eclipsada", + "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "block.cinderscapes.umbral_sign": "Cartel eclipsado", + "block.cinderscapes.umbral_slab": "Baldosa eclipsada", + "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "block.cinderscapes.umbral_stem": "Tallo eclipsado", + "block.cinderscapes.umbral_trapdoor": "Escotilla eclipsada", + "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Pila de ceniza", + "item.cinderscapes.bramble_berries": "Zarzamora", + "item.cinderscapes.sulfur": "Azufre", + + "item.cinderscapes.rose_quartz": "Cuarzo rosa", + "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", + "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", "item.cinderscapes.music_disc_chilling_in_hell": "Disco", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Disco", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Ceniza", + "item.cinderscapes.ash_block": "Bloque de ceniza", + "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", + "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "item.cinderscapes.crystinium": "Cristinio", + "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "item.cinderscapes.luminous_pod": "Vaina luminosa", + "item.cinderscapes.photofern": "Fotohelecho", + "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", + "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "item.cinderscapes.pyracinth": "Piracinto", + "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", + "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", + "item.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", + "item.cinderscapes.rose_quartz_pillar": "Columna de cuarzo rosa", + "item.cinderscapes.rose_quartz_slab": "Baldosa de cuarzo rosa", + "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", + "item.cinderscapes.scorched_button": "Botón chamuscado", + "item.cinderscapes.scorched_door": "Puerta chamuscada", + "item.cinderscapes.scorched_fence": "Valla chamuscada", + "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", + "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", + "item.cinderscapes.scorched_planks": "Madera chamuscada", + "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", + "item.cinderscapes.scorched_sign": "Cartel chamuscado", + "item.cinderscapes.scorched_slab": "Baldosa chamuscada", + "item.cinderscapes.scorched_sprouts": "Brotes chamuscados", + "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", + "item.cinderscapes.scorched_stem": "Tallo chamuscado", + "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", + "item.cinderscapes.scorched_trapdoor": "Escotilla chamuscada", + "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_pillar": "Columna de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_slab": "Baldosa de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_slab": "Baldosa de cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_slab": "Baldosa de cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Baldosa de cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", + "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", + "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "item.cinderscapes.sulfur_block": "Bloque de azufre", + "item.cinderscapes.sulfur_ore": "Mineral de azufre", + "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_pillar": "Columna de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_slab": "Baldosa de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "item.cinderscapes.tall_photofern": "Fotohelecho alto", + "item.cinderscapes.twilight_fescues": "Festuca crepuscular", + "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "item.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", + "item.cinderscapes.umbral_button": "Botón eclipsado", + "item.cinderscapes.umbral_door": "Puerta eclipsada", + "item.cinderscapes.umbral_fence": "Valla eclipsada", + "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "item.cinderscapes.umbral_fungus": "Hongo eclipsado", + "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "item.cinderscapes.umbral_nylium": "Nilio eclipsado", + "item.cinderscapes.umbral_planks": "Madera eclipsada", + "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "item.cinderscapes.umbral_sign": "Cartel eclipsado", + "item.cinderscapes.umbral_slab": "Baldosa eclipsada", + "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "item.cinderscapes.umbral_stem": "Tallo eclipsado", + "item.cinderscapes.umbral_trapdoor": "Escotilla eclipsada", + "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_es.json b/client/src/main/resources/assets/cinderscapes/lang/es_es.json index 765ef5eb..5be32b63 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_es.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_es.json @@ -1,107 +1,34 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Mena de azufre", - "block.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur": "Azufre", - - "item.cinderscapes.bramble_berries": "Zarzamora", - "block.cinderscapes.bramble_berry_bush": "Zarza", - + "biome.cinderscapes.ashy_shoals": "Bancos cenizos", + "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", "biome.cinderscapes.luminous_grove": "Arboleda luminosa", - - "block.cinderscapes.luminous_pod": "Vaina luminosa", - - "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "block.cinderscapes.twilight_fescues": "Festuca crepuscular", - "block.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", - - "block.cinderscapes.photofern": "Fotohelecho", - "block.cinderscapes.tall_photofern": "Fotohelecho grande", - - "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "block.cinderscapes.umbral_button": "Botón eclipsado", - "block.cinderscapes.umbral_door": "Puerta eclipsada", - "block.cinderscapes.umbral_fence": "Valla eclipsada", - "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "block.cinderscapes.umbral_fungus": "Hongo eclipsado", - "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "block.cinderscapes.umbral_nylium": "Necelio eclipsado", - "block.cinderscapes.umbral_planks": "Madera eclipsada", - "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "block.cinderscapes.umbral_sign": "Cartel eclipsado", - "block.cinderscapes.umbral_slab": "Losa eclipsada", - "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "block.cinderscapes.umbral_stem": "Tallo eclipsado", - "block.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", - "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - - "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "biome.cinderscapes.quartz_cavern": "Caverna de cuarzo", - "block.cinderscapes.crystinium": "Cristinio", - - "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_ore": "Mena de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", - + "block.cinderscapes.ash": "Ceniza", + "block.cinderscapes.ash_block": "Bloque de ceniza", + "block.cinderscapes.bramble_berry_bush": "Zarza", "block.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", "block.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "block.cinderscapes.crystinium": "Cristinio", + "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "block.cinderscapes.luminous_pod": "Vaina luminosa", + "block.cinderscapes.photofern": "Fotohelecho", + "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", "block.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "block.cinderscapes.pyracinth": "Piracinto", "block.cinderscapes.rose_quartz_block": "Cuarzo rosa", "block.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", "block.cinderscapes.rose_quartz_ore": "Mena de cuarzo rosa", "block.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", "block.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", "block.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.rose_quartz": "Cuarzo rosa", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_ore": "Mena de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", - - "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", - - "biome.cinderscapes.ashy_shoals": "Bancos cenizos", - - "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "block.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", - "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "block.cinderscapes.pyracinth": "Piracinto", - - "item.cinderscapes.ash_pile": "Pila de ceniza", - "block.cinderscapes.ash": "Ceniza", - "block.cinderscapes.ash_block": "Bloque de ceniza", - "block.cinderscapes.scorched_button": "Botón chamuscado", "block.cinderscapes.scorched_door": "Puerta chamuscada", "block.cinderscapes.scorched_fence": "Valla chamuscada", @@ -109,19 +36,163 @@ "block.cinderscapes.scorched_hyphae": "Hifas chamuscadas", "block.cinderscapes.scorched_planks": "Madera chamuscada", "block.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", "block.cinderscapes.scorched_sign": "Cartel chamuscado", "block.cinderscapes.scorched_slab": "Losa chamuscada", + "block.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", "block.cinderscapes.scorched_stairs": "Escaleras chamuscada", "block.cinderscapes.scorched_stem": "Tallo chamuscado", + "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", "block.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", + "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_ore": "Mena de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", "block.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", "block.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "block.cinderscapes.sulfur_block": "Bloque de azufre", + "block.cinderscapes.sulfur_ore": "Mena de azufre", + "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_ore": "Mena de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "block.cinderscapes.tall_photofern": "Fotohelecho grande", + "block.cinderscapes.twilight_fescues": "Festuca crepuscular", + "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "block.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", + "block.cinderscapes.umbral_button": "Botón eclipsado", + "block.cinderscapes.umbral_door": "Puerta eclipsada", + "block.cinderscapes.umbral_fence": "Valla eclipsada", + "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "block.cinderscapes.umbral_fungus": "Hongo eclipsado", + "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "block.cinderscapes.umbral_nylium": "Necelio eclipsado", + "block.cinderscapes.umbral_planks": "Madera eclipsada", + "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "block.cinderscapes.umbral_sign": "Cartel eclipsado", + "block.cinderscapes.umbral_slab": "Losa eclipsada", + "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "block.cinderscapes.umbral_stem": "Tallo eclipsado", + "block.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", + "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Pila de ceniza", + "item.cinderscapes.bramble_berries": "Zarzamora", + "item.cinderscapes.sulfur": "Azufre", + + "item.cinderscapes.rose_quartz": "Cuarzo rosa", + "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", + "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", "item.cinderscapes.music_disc_chilling_in_hell": "Disco de música", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Disco de música", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Ceniza", + "item.cinderscapes.ash_block": "Bloque de ceniza", + "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", + "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "item.cinderscapes.crystinium": "Cristinio", + "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "item.cinderscapes.luminous_pod": "Vaina luminosa", + "item.cinderscapes.photofern": "Fotohelecho", + "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", + "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "item.cinderscapes.pyracinth": "Piracinto", + "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", + "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", + "item.cinderscapes.rose_quartz_ore": "Mena de cuarzo rosa", + "item.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", + "item.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", + "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", + "item.cinderscapes.scorched_button": "Botón chamuscado", + "item.cinderscapes.scorched_door": "Puerta chamuscada", + "item.cinderscapes.scorched_fence": "Valla chamuscada", + "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", + "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", + "item.cinderscapes.scorched_planks": "Madera chamuscada", + "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", + "item.cinderscapes.scorched_sign": "Cartel chamuscado", + "item.cinderscapes.scorched_slab": "Losa chamuscada", + "item.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", + "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", + "item.cinderscapes.scorched_stem": "Tallo chamuscado", + "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", + "item.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", + "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_ore": "Mena de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", + "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", + "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "item.cinderscapes.sulfur_block": "Bloque de azufre", + "item.cinderscapes.sulfur_ore": "Mena de azufre", + "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_ore": "Mena de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "item.cinderscapes.tall_photofern": "Fotohelecho grande", + "item.cinderscapes.twilight_fescues": "Festuca crepuscular", + "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "item.cinderscapes.twilight_vine_block": "Bloque de enredaderas crepusculares", + "item.cinderscapes.umbral_button": "Botón eclipsado", + "item.cinderscapes.umbral_door": "Puerta eclipsada", + "item.cinderscapes.umbral_fence": "Valla eclipsada", + "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "item.cinderscapes.umbral_fungus": "Hongo eclipsado", + "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "item.cinderscapes.umbral_nylium": "Necelio eclipsado", + "item.cinderscapes.umbral_planks": "Madera eclipsada", + "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "item.cinderscapes.umbral_sign": "Cartel eclipsado", + "item.cinderscapes.umbral_slab": "Losa eclipsada", + "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "item.cinderscapes.umbral_stem": "Tallo eclipsado", + "item.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", + "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/es_mx.json b/client/src/main/resources/assets/cinderscapes/lang/es_mx.json index a1d3b2fe..9dece46f 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/es_mx.json +++ b/client/src/main/resources/assets/cinderscapes/lang/es_mx.json @@ -1,107 +1,34 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Mineral de azufre", - "block.cinderscapes.sulfur_block": "Bloque de azufre", - "item.cinderscapes.sulfur": "Azufre", - - "item.cinderscapes.bramble_berries": "Zarzamora", - "block.cinderscapes.bramble_berry_bush": "Zarza", - + "biome.cinderscapes.ashy_shoals": "Bancos cenizos", + "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", "biome.cinderscapes.luminous_grove": "Arboleda luminosa", - - "block.cinderscapes.luminous_pod": "Vaina luminosa", - - "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", - "block.cinderscapes.twilight_fescues": "Festuca crepuscular", - "block.cinderscapes.twilight_vine_block": "Bloque de lianas crepusculares", - - "block.cinderscapes.photofern": "Fotohelecho", - "block.cinderscapes.tall_photofern": "Fotohelecho alto", - - "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", - "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", - "block.cinderscapes.umbral_button": "Botón eclipsado", - "block.cinderscapes.umbral_door": "Puerta eclipsada", - "block.cinderscapes.umbral_fence": "Valla eclipsada", - "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", - "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", - "block.cinderscapes.umbral_fungus": "Hongo eclipsado", - "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", - "block.cinderscapes.umbral_nylium": "Nilio eclipsado", - "block.cinderscapes.umbral_planks": "Madera eclipsada", - "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", - "block.cinderscapes.umbral_sign": "Letrero eclipsado", - "block.cinderscapes.umbral_slab": "Losa eclipsada", - "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", - "block.cinderscapes.umbral_stem": "Tallo eclipsado", - "block.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", - "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", - - "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", - "biome.cinderscapes.quartz_cavern": "Caverna de cuarzo", - "block.cinderscapes.crystinium": "Cristinio", - - "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", - "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", - "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", - "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", - "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", - "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", - "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", - "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", - + "block.cinderscapes.ash": "Ceniza", + "block.cinderscapes.ash_block": "Bloque de ceniza", + "block.cinderscapes.bramble_berry_bush": "Zarza", "block.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "block.cinderscapes.crystalline_quartz": "Cuarzo cristalino", "block.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "block.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "block.cinderscapes.crystinium": "Cristinio", + "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "block.cinderscapes.luminous_pod": "Vaina luminosa", + "block.cinderscapes.photofern": "Fotohelecho", + "block.cinderscapes.polypite_quartz": "Polipita de cuarzo", "block.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "block.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "block.cinderscapes.pyracinth": "Piracinto", "block.cinderscapes.rose_quartz_block": "Cuarzo rosa", "block.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", "block.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", "block.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", "block.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", "block.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", - "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", - "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", - "item.cinderscapes.rose_quartz": "Cuarzo rosa", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", - "block.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", - "block.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", - "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", - "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", - "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", - "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", - - "biome.cinderscapes.blackstone_shales": "Esquistos de piedra negra", - - "biome.cinderscapes.ashy_shoals": "Bancos cenizos", - - "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "block.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", - "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", - "block.cinderscapes.pyracinth": "Piracinto", - - "item.cinderscapes.ash_pile": "Pila de ceniza", - "block.cinderscapes.ash": "Ceniza", - "block.cinderscapes.ash_block": "Bloque de ceniza", - "block.cinderscapes.scorched_button": "Botón chamuscado", "block.cinderscapes.scorched_door": "Puerta chamuscada", "block.cinderscapes.scorched_fence": "Valla chamuscada", @@ -109,19 +36,163 @@ "block.cinderscapes.scorched_hyphae": "Hifas chamuscadas", "block.cinderscapes.scorched_planks": "Madera chamuscada", "block.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", "block.cinderscapes.scorched_sign": "Letrero chamuscado", "block.cinderscapes.scorched_slab": "Losa chamuscada", + "block.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", "block.cinderscapes.scorched_stairs": "Escaleras chamuscada", "block.cinderscapes.scorched_stem": "Tallo chamuscado", + "block.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", "block.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", + "block.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "block.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", + "block.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "block.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", + "block.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "block.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "block.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", "block.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", "block.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "block.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "block.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "block.cinderscapes.sulfur_block": "Bloque de azufre", + "block.cinderscapes.sulfur_ore": "Mineral de azufre", + "block.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", + "block.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "block.cinderscapes.tall_photofern": "Fotohelecho alto", + "block.cinderscapes.twilight_fescues": "Festuca crepuscular", + "block.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "block.cinderscapes.twilight_vine_block": "Bloque de lianas crepusculares", + "block.cinderscapes.umbral_button": "Botón eclipsado", + "block.cinderscapes.umbral_door": "Puerta eclipsada", + "block.cinderscapes.umbral_fence": "Valla eclipsada", + "block.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "block.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "block.cinderscapes.umbral_fungus": "Hongo eclipsado", + "block.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "block.cinderscapes.umbral_nylium": "Nilio eclipsado", + "block.cinderscapes.umbral_planks": "Madera eclipsada", + "block.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "block.cinderscapes.umbral_sign": "Letrero eclipsado", + "block.cinderscapes.umbral_slab": "Losa eclipsada", + "block.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "block.cinderscapes.umbral_stem": "Tallo eclipsado", + "block.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", + "block.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Pila de ceniza", + "item.cinderscapes.bramble_berries": "Zarzamora", + "item.cinderscapes.sulfur": "Azufre", + + "item.cinderscapes.rose_quartz": "Cuarzo rosa", + "item.cinderscapes.smoky_quartz": "Cuarzo ahumado", + "item.cinderscapes.sulfur_quartz": "Cuarzo de azufre", "item.cinderscapes.music_disc_chilling_in_hell": "Disco", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Disco", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Ceniza", + "item.cinderscapes.ash_block": "Bloque de ceniza", + "item.cinderscapes.chiseled_rose_quartz_block": "Cuarzo rosa cincelado", + "item.cinderscapes.chiseled_smoky_quartz_block": "Cuarzo ahumado cincelado", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Cuarzo de azufre cincelado", + "item.cinderscapes.crystalline_quartz": "Cuarzo cristalino", + "item.cinderscapes.crystalline_rose_quartz": "Cuarzo rosa cristalino", + "item.cinderscapes.crystalline_smoky_quartz": "Cuarzo ahumado cristalino", + "item.cinderscapes.crystalline_sulfur_quartz": "Cuarzo de azufre cristalino", + "item.cinderscapes.crystinium": "Cristinio", + "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma pálido", + "item.cinderscapes.luminous_pod": "Vaina luminosa", + "item.cinderscapes.photofern": "Fotohelecho", + "item.cinderscapes.polypite_quartz": "Polipita de cuarzo", + "item.cinderscapes.polypite_rose_quartz": "Polipita de cuarzo rosa", + "item.cinderscapes.polypite_smoky_quartz": "Polipita de cuarzo ahumado", + "item.cinderscapes.polypite_sulfur_quartz": "Polipita de cuarzo de azufre", + "item.cinderscapes.pyracinth": "Piracinto", + "item.cinderscapes.rose_quartz_block": "Cuarzo rosa", + "item.cinderscapes.rose_quartz_bricks": "Ladrillos de cuarzo rosa", + "item.cinderscapes.rose_quartz_ore": "Mineral de cuarzo rosa", + "item.cinderscapes.rose_quartz_pillar": "Pilar de cuarzo rosa", + "item.cinderscapes.rose_quartz_slab": "Losa de cuarzo rosa", + "item.cinderscapes.rose_quartz_stairs": "Escaleras de cuarzo rosa", + "item.cinderscapes.scorched_button": "Botón chamuscado", + "item.cinderscapes.scorched_door": "Puerta chamuscada", + "item.cinderscapes.scorched_fence": "Valla chamuscada", + "item.cinderscapes.scorched_fence_gate": "Puerta de valla chamuscada", + "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", + "item.cinderscapes.scorched_planks": "Madera chamuscada", + "item.cinderscapes.scorched_pressure_plate": "Placa de presión chamuscada", + "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", + "item.cinderscapes.scorched_sign": "Letrero chamuscado", + "item.cinderscapes.scorched_slab": "Losa chamuscada", + "item.cinderscapes.scorched_sprouts": "Rastrojo chamuscado", + "item.cinderscapes.scorched_stairs": "Escaleras chamuscada", + "item.cinderscapes.scorched_stem": "Tallo chamuscado", + "item.cinderscapes.scorched_tendrils": "Zarcillos chamuscados", + "item.cinderscapes.scorched_trapdoor": "Trampilla chamuscada", + "item.cinderscapes.smoky_quartz_block": "Cuarzo ahumado", + "item.cinderscapes.smoky_quartz_bricks": "Ladrillos de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_ore": "Mineral de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_pillar": "Pilar de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_slab": "Losa de cuarzo ahumado", + "item.cinderscapes.smoky_quartz_stairs": "Escaleras de cuarzo ahumado", + "item.cinderscapes.smooth_rose_quartz": "Cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_slab": "Losa de cuarzo rosa liso", + "item.cinderscapes.smooth_rose_quartz_stairs": "Escaleras de cuarzo rosa liso", + "item.cinderscapes.smooth_smoky_quartz": "Cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_slab": "Losa de cuarzo ahumado liso", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Escaleras de cuarzo ahumado liso", + "item.cinderscapes.smooth_sulfur_quartz": "Cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Losa de cuarzo de azufre liso", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escaleras de cuarzo de azufre liso", + "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas sin corteza", + "item.cinderscapes.stripped_scorched_stem": "Tallo chamuscado sin corteza", + "item.cinderscapes.stripped_umbral_hyphae": "Hifas eclipsadas sin corteza", + "item.cinderscapes.stripped_umbral_stem": "Tallo eclipsado sin corteza", + "item.cinderscapes.sulfur_block": "Bloque de azufre", + "item.cinderscapes.sulfur_ore": "Mineral de azufre", + "item.cinderscapes.sulfur_quartz_block": "Cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_bricks": "Ladrillos de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_ore": "Mineral de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_pillar": "Pilar de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_slab": "Losa de cuarzo de azufre", + "item.cinderscapes.sulfur_quartz_stairs": "Escaleras de cuarzo de azufre", + "item.cinderscapes.tall_photofern": "Fotohelecho alto", + "item.cinderscapes.twilight_fescues": "Festuca crepuscular", + "item.cinderscapes.twilight_tendrils": "Zarcillos crepusculares", + "item.cinderscapes.twilight_vine_block": "Bloque de lianas crepusculares", + "item.cinderscapes.umbral_button": "Botón eclipsado", + "item.cinderscapes.umbral_door": "Puerta eclipsada", + "item.cinderscapes.umbral_fence": "Valla eclipsada", + "item.cinderscapes.umbral_fence_gate": "Puerta de valla eclipsada", + "item.cinderscapes.umbral_flesh_block": "Carne eclipsada", + "item.cinderscapes.umbral_fungus": "Hongo eclipsado", + "item.cinderscapes.umbral_hyphae": "Hifas eclipsadas", + "item.cinderscapes.umbral_nylium": "Nilio eclipsado", + "item.cinderscapes.umbral_planks": "Madera eclipsada", + "item.cinderscapes.umbral_pressure_plate": "Placa de presión eclipsada", + "item.cinderscapes.umbral_sign": "Letrero eclipsado", + "item.cinderscapes.umbral_slab": "Losa eclipsada", + "item.cinderscapes.umbral_stairs": "Escaleras eclipsadas", + "item.cinderscapes.umbral_stem": "Tallo eclipsado", + "item.cinderscapes.umbral_trapdoor": "Trampilla eclipsada", + "item.cinderscapes.umbral_wart_block": "Bloque de verrugas eclipsadas", + "text.autoconfig.cinderscapes.title": "Configuración de Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar generación de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Activar bioma de bancos cenizos", diff --git a/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json b/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json index 45f119e7..c2ee3a2b 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json +++ b/client/src/main/resources/assets/cinderscapes/lang/fr_fr.json @@ -1,26 +1,80 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Minerai de soufre", - "block.cinderscapes.sulfur_block": "Bloc de soufre", - "item.cinderscapes.sulfur": "Soufre", - - "item.cinderscapes.bramble_berries": "Baies de roncier", - "block.cinderscapes.bramble_berry_bush": "Roncier", - + "biome.cinderscapes.ashy_shoals": "Bancs de cendre", + "biome.cinderscapes.blackstone_shales": "Schistes de pierre noire", "biome.cinderscapes.luminous_grove": "Bosquet lumineux", + "biome.cinderscapes.quartz_cavern": "Canyon de quartz", + "block.cinderscapes.ash": "Cendre", + "block.cinderscapes.ash_block": "Bloc de cendres", + "block.cinderscapes.bramble_berry_bush": "Roncier", + "block.cinderscapes.chiseled_rose_quartz_block": "Bloc de quartz rose sculpté", + "block.cinderscapes.chiseled_smoky_quartz_block": "Bloc de quartz fumé sculpté", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Bloc de quartz sulfureux sculpté", + "block.cinderscapes.crystalline_quartz": "Quartz cristallin", + "block.cinderscapes.crystalline_rose_quartz": "Quartz rose cristallin", + "block.cinderscapes.crystalline_smoky_quartz": "Quartz fumé cristallin", + "block.cinderscapes.crystalline_sulfur_quartz": "Quartz sulfureux cristallin", + "block.cinderscapes.crystinium": "Cristinium", + "block.cinderscapes.ghastly_ectoplasm": "Ectoplasme blême", "block.cinderscapes.luminous_pod": "Carpelle lumineuse", - - "block.cinderscapes.twilight_tendrils": "Vrilles crépusculaires", - "block.cinderscapes.twilight_fescues": "Fétuques crépusculaires", - "block.cinderscapes.twilight_vine_block": "Bloc de vigne crépusculaire", - "block.cinderscapes.photofern": "Photofougère", - "block.cinderscapes.tall_photofern": "Grande photofougère", - + "block.cinderscapes.polypite_quartz": "Quartz polypite", + "block.cinderscapes.polypite_rose_quartz": "Quartz rose polypite", + "block.cinderscapes.polypite_smoky_quartz": "Quartz fumé polypite", + "block.cinderscapes.polypite_sulfur_quartz": "Quartz sulfureux polypite", + "block.cinderscapes.pyracinth": "Pyracinthe", + "block.cinderscapes.rose_quartz_block": "Bloc de quartz rose", + "block.cinderscapes.rose_quartz_bricks": "Briques de quartz rose", + "block.cinderscapes.rose_quartz_ore": "Minerai de quartz rose", + "block.cinderscapes.rose_quartz_pillar": "Pilier de quartz rose", + "block.cinderscapes.rose_quartz_slab": "Dalle de quartz rose", + "block.cinderscapes.rose_quartz_stairs": "Escalier en quartz rose", + "block.cinderscapes.scorched_button": "Bouton roussi", + "block.cinderscapes.scorched_door": "Porte roussie", + "block.cinderscapes.scorched_fence": "Barrière roussie", + "block.cinderscapes.scorched_fence_gate": "Portillon roussi", + "block.cinderscapes.scorched_hyphae": "Hyphes roussies", + "block.cinderscapes.scorched_planks": "Planches roussies", + "block.cinderscapes.scorched_pressure_plate": "Plaque de pression roussie", + "block.cinderscapes.scorched_shrub": "Arbuste roussi", + "block.cinderscapes.scorched_sign": "Pancarte roussie", + "block.cinderscapes.scorched_slab": "Dalle roussie", + "block.cinderscapes.scorched_sprouts": "Germes roussis", + "block.cinderscapes.scorched_stairs": "Escalier roussi", + "block.cinderscapes.scorched_stem": "Tige roussie", + "block.cinderscapes.scorched_tendrils": "Vrilles roussies", + "block.cinderscapes.scorched_trapdoor": "Trappe roussie", + "block.cinderscapes.smoky_quartz_block": "Bloc de quartz fumé", + "block.cinderscapes.smoky_quartz_bricks": "Briques de quartz fumé", + "block.cinderscapes.smoky_quartz_ore": "Minerai de quartz fumé", + "block.cinderscapes.smoky_quartz_pillar": "Pilier de quartz fumé", + "block.cinderscapes.smoky_quartz_slab": "Dalle de quartz fumé", + "block.cinderscapes.smoky_quartz_stairs": "Escalier en quartz fumé", + "block.cinderscapes.smooth_rose_quartz": "Bloc de quartz rose lisse", + "block.cinderscapes.smooth_rose_quartz_slab": "Dalle en quartz rose lisse", + "block.cinderscapes.smooth_rose_quartz_stairs": "Escalier en quartz rose lisse", + "block.cinderscapes.smooth_smoky_quartz": "Bloc de quartz fumé lisse", + "block.cinderscapes.smooth_smoky_quartz_slab": "Dalle en quartz fumé lisse", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Escalier en quartz fumé lisse", + "block.cinderscapes.smooth_sulfur_quartz": "Bloc de quartz sulfureux lisse", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Dalle en quartz sulfureux lisse", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escalier en quartz sulfureux lisse", + "block.cinderscapes.stripped_scorched_hyphae": "Hyphes roussies dénudées", + "block.cinderscapes.stripped_scorched_stem": "Tige roussie dénudée", "block.cinderscapes.stripped_umbral_hyphae": "Hyphes éclipsées dénudées", "block.cinderscapes.stripped_umbral_stem": "Tige éclipsée dénudée", + "block.cinderscapes.sulfur_block": "Bloc de soufre", + "block.cinderscapes.sulfur_ore": "Minerai de soufre", + "block.cinderscapes.sulfur_quartz_block": "Bloc de quartz sulfureux", + "block.cinderscapes.sulfur_quartz_bricks": "Briques de quartz sulfureux", + "block.cinderscapes.sulfur_quartz_ore": "Minerai de quartz sulfureux", + "block.cinderscapes.sulfur_quartz_pillar": "Pilier de quartz sulfureux", + "block.cinderscapes.sulfur_quartz_slab": "Dalle de quartz sulfureux", + "block.cinderscapes.sulfur_quartz_stairs": "Escalier en quartz sulfureux", + "block.cinderscapes.tall_photofern": "Grande photofougère", + "block.cinderscapes.twilight_fescues": "Fétuques crépusculaires", + "block.cinderscapes.twilight_tendrils": "Vrilles crépusculaires", + "block.cinderscapes.twilight_vine_block": "Bloc de vigne crépusculaire", "block.cinderscapes.umbral_button": "Bouton éclipsé", "block.cinderscapes.umbral_door": "Porte éclipsée", "block.cinderscapes.umbral_fence": "Barrière éclipsée", @@ -38,82 +92,99 @@ "block.cinderscapes.umbral_trapdoor": "Trappe éclipsée", "block.cinderscapes.umbral_wart_block": "Bloc de verrues éclipsées", - "block.cinderscapes.ghastly_ectoplasm": "Ectoplasme blême", - - "biome.cinderscapes.quartz_cavern": "Canyon de quartz", - - "block.cinderscapes.crystinium": "Cristinium", - - "block.cinderscapes.polypite_quartz": "Quartz polypite", - "block.cinderscapes.crystalline_quartz": "Quartz cristallin", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Bloc de quartz sulfureux sculpté", - "block.cinderscapes.crystalline_sulfur_quartz": "Quartz sulfureux cristallin", - "block.cinderscapes.polypite_sulfur_quartz": "Quartz sulfureux polypite", - "block.cinderscapes.smooth_sulfur_quartz": "Bloc de quartz sulfureux lisse", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Dalle en quartz sulfureux lisse", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escalier en quartz sulfureux lisse", - "block.cinderscapes.sulfur_quartz_block": "Bloc de quartz sulfureux", - "block.cinderscapes.sulfur_quartz_bricks": "Briques de quartz sulfureux", - "block.cinderscapes.sulfur_quartz_ore": "Minerai de quartz sulfureux", - "block.cinderscapes.sulfur_quartz_pillar": "Pilier de quartz sulfureux", - "block.cinderscapes.sulfur_quartz_slab": "Dalle de quartz sulfureux", - "block.cinderscapes.sulfur_quartz_stairs": "Escalier en quartz sulfureux", - "item.cinderscapes.sulfur_quartz": "Quartz sulfureux", + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Tas de cendres", + "item.cinderscapes.bramble_berries": "Baies de roncier", + "item.cinderscapes.sulfur": "Soufre", - "block.cinderscapes.chiseled_rose_quartz_block": "Bloc de quartz rose sculpté", - "block.cinderscapes.crystalline_rose_quartz": "Quartz rose cristallin", - "block.cinderscapes.polypite_rose_quartz": "Quartz rose polypite", - "block.cinderscapes.rose_quartz_block": "Bloc de quartz rose", - "block.cinderscapes.rose_quartz_bricks": "Briques de quartz rose", - "block.cinderscapes.rose_quartz_ore": "Minerai de quartz rose", - "block.cinderscapes.rose_quartz_pillar": "Pilier de quartz rose", - "block.cinderscapes.rose_quartz_slab": "Dalle de quartz rose", - "block.cinderscapes.rose_quartz_stairs": "Escalier en quartz rose", - "block.cinderscapes.smooth_rose_quartz": "Bloc de quartz rose lisse", - "block.cinderscapes.smooth_rose_quartz_slab": "Dalle en quartz rose lisse", - "block.cinderscapes.smooth_rose_quartz_stairs": "Escalier en quartz rose lisse", "item.cinderscapes.rose_quartz": "Quartz rose", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Bloc de quartz fumé sculpté", - "block.cinderscapes.crystalline_smoky_quartz": "Quartz fumé cristallin", - "block.cinderscapes.polypite_smoky_quartz": "Quartz fumé polypite", - "block.cinderscapes.smoky_quartz_block": "Bloc de quartz fumé", - "block.cinderscapes.smoky_quartz_bricks": "Briques de quartz fumé", - "block.cinderscapes.smoky_quartz_ore": "Minerai de quartz fumé", - "block.cinderscapes.smoky_quartz_pillar": "Pilier de quartz fumé", - "block.cinderscapes.smoky_quartz_slab": "Dalle de quartz fumé", - "block.cinderscapes.smoky_quartz_stairs": "Escalier en quartz fumé", - "block.cinderscapes.smooth_smoky_quartz": "Bloc de quartz fumé lisse", - "block.cinderscapes.smooth_smoky_quartz_slab": "Dalle en quartz fumé lisse", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Escalier en quartz fumé lisse", "item.cinderscapes.smoky_quartz": "Quartz fumé", + "item.cinderscapes.sulfur_quartz": "Quartz sulfureux", - "biome.cinderscapes.blackstone_shales": "Schistes de pierre noire", - - "biome.cinderscapes.ashy_shoals": "Bancs de cendre", - - "block.cinderscapes.scorched_shrub": "Arbuste roussi", - "block.cinderscapes.scorched_sprouts": "Germes roussis", - "block.cinderscapes.scorched_tendrils": "Vrilles roussies", - "block.cinderscapes.pyracinth": "Pyracinthe", - - "item.cinderscapes.ash_pile": "Tas de cendres", - "block.cinderscapes.ash": "Cendre", - "block.cinderscapes.ash_block": "Bloc de cendres", - - "block.cinderscapes.scorched_button": "Bouton roussi", - "block.cinderscapes.scorched_door": "Porte roussie", - "block.cinderscapes.scorched_fence": "Barrière roussie", - "block.cinderscapes.scorched_fence_gate": "Portillon roussi", - "block.cinderscapes.scorched_hyphae": "Hyphes roussies", - "block.cinderscapes.scorched_planks": "Planches roussies", - "block.cinderscapes.scorched_pressure_plate": "Plaque de pression roussie", - "block.cinderscapes.scorched_sign": "Pancarte roussie", - "block.cinderscapes.scorched_slab": "Dalle roussie", - "block.cinderscapes.scorched_stairs": "Escalier roussi", - "block.cinderscapes.scorched_stem": "Tige roussie", - "block.cinderscapes.scorched_trapdoor": "Trappe roussie", - "block.cinderscapes.stripped_scorched_hyphae": "Hyphes roussies dénudées", - "block.cinderscapes.stripped_scorched_stem": "Tige roussie dénudée" + "item.cinderscapes.ash": "Cendre", + "item.cinderscapes.ash_block": "Bloc de cendres", + "item.cinderscapes.chiseled_rose_quartz_block": "Bloc de quartz rose sculpté", + "item.cinderscapes.chiseled_smoky_quartz_block": "Bloc de quartz fumé sculpté", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Bloc de quartz sulfureux sculpté", + "item.cinderscapes.crystalline_quartz": "Quartz cristallin", + "item.cinderscapes.crystalline_rose_quartz": "Quartz rose cristallin", + "item.cinderscapes.crystalline_smoky_quartz": "Quartz fumé cristallin", + "item.cinderscapes.crystalline_sulfur_quartz": "Quartz sulfureux cristallin", + "item.cinderscapes.crystinium": "Cristinium", + "item.cinderscapes.ghastly_ectoplasm": "Ectoplasme blême", + "item.cinderscapes.luminous_pod": "Carpelle lumineuse", + "item.cinderscapes.photofern": "Photofougère", + "item.cinderscapes.polypite_quartz": "Quartz polypite", + "item.cinderscapes.polypite_rose_quartz": "Quartz rose polypite", + "item.cinderscapes.polypite_smoky_quartz": "Quartz fumé polypite", + "item.cinderscapes.polypite_sulfur_quartz": "Quartz sulfureux polypite", + "item.cinderscapes.pyracinth": "Pyracinthe", + "item.cinderscapes.rose_quartz_block": "Bloc de quartz rose", + "item.cinderscapes.rose_quartz_bricks": "Briques de quartz rose", + "item.cinderscapes.rose_quartz_ore": "Minerai de quartz rose", + "item.cinderscapes.rose_quartz_pillar": "Pilier de quartz rose", + "item.cinderscapes.rose_quartz_slab": "Dalle de quartz rose", + "item.cinderscapes.rose_quartz_stairs": "Escalier en quartz rose", + "item.cinderscapes.scorched_button": "Bouton roussi", + "item.cinderscapes.scorched_door": "Porte roussie", + "item.cinderscapes.scorched_fence": "Barrière roussie", + "item.cinderscapes.scorched_fence_gate": "Portillon roussi", + "item.cinderscapes.scorched_hyphae": "Hyphes roussies", + "item.cinderscapes.scorched_planks": "Planches roussies", + "item.cinderscapes.scorched_pressure_plate": "Plaque de pression roussie", + "item.cinderscapes.scorched_shrub": "Arbuste roussi", + "item.cinderscapes.scorched_sign": "Pancarte roussie", + "item.cinderscapes.scorched_slab": "Dalle roussie", + "item.cinderscapes.scorched_sprouts": "Germes roussis", + "item.cinderscapes.scorched_stairs": "Escalier roussi", + "item.cinderscapes.scorched_stem": "Tige roussie", + "item.cinderscapes.scorched_tendrils": "Vrilles roussies", + "item.cinderscapes.scorched_trapdoor": "Trappe roussie", + "item.cinderscapes.smoky_quartz_block": "Bloc de quartz fumé", + "item.cinderscapes.smoky_quartz_bricks": "Briques de quartz fumé", + "item.cinderscapes.smoky_quartz_ore": "Minerai de quartz fumé", + "item.cinderscapes.smoky_quartz_pillar": "Pilier de quartz fumé", + "item.cinderscapes.smoky_quartz_slab": "Dalle de quartz fumé", + "item.cinderscapes.smoky_quartz_stairs": "Escalier en quartz fumé", + "item.cinderscapes.smooth_rose_quartz": "Bloc de quartz rose lisse", + "item.cinderscapes.smooth_rose_quartz_slab": "Dalle en quartz rose lisse", + "item.cinderscapes.smooth_rose_quartz_stairs": "Escalier en quartz rose lisse", + "item.cinderscapes.smooth_smoky_quartz": "Bloc de quartz fumé lisse", + "item.cinderscapes.smooth_smoky_quartz_slab": "Dalle en quartz fumé lisse", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Escalier en quartz fumé lisse", + "item.cinderscapes.smooth_sulfur_quartz": "Bloc de quartz sulfureux lisse", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Dalle en quartz sulfureux lisse", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escalier en quartz sulfureux lisse", + "item.cinderscapes.stripped_scorched_hyphae": "Hyphes roussies dénudées", + "item.cinderscapes.stripped_scorched_stem": "Tige roussie dénudée", + "item.cinderscapes.stripped_umbral_hyphae": "Hyphes éclipsées dénudées", + "item.cinderscapes.stripped_umbral_stem": "Tige éclipsée dénudée", + "item.cinderscapes.sulfur_block": "Bloc de soufre", + "item.cinderscapes.sulfur_ore": "Minerai de soufre", + "item.cinderscapes.sulfur_quartz_block": "Bloc de quartz sulfureux", + "item.cinderscapes.sulfur_quartz_bricks": "Briques de quartz sulfureux", + "item.cinderscapes.sulfur_quartz_ore": "Minerai de quartz sulfureux", + "item.cinderscapes.sulfur_quartz_pillar": "Pilier de quartz sulfureux", + "item.cinderscapes.sulfur_quartz_slab": "Dalle de quartz sulfureux", + "item.cinderscapes.sulfur_quartz_stairs": "Escalier en quartz sulfureux", + "item.cinderscapes.tall_photofern": "Grande photofougère", + "item.cinderscapes.twilight_fescues": "Fétuques crépusculaires", + "item.cinderscapes.twilight_tendrils": "Vrilles crépusculaires", + "item.cinderscapes.twilight_vine_block": "Bloc de vigne crépusculaire", + "item.cinderscapes.umbral_button": "Bouton éclipsé", + "item.cinderscapes.umbral_door": "Porte éclipsée", + "item.cinderscapes.umbral_fence": "Barrière éclipsée", + "item.cinderscapes.umbral_fence_gate": "Portillon éclipsé", + "item.cinderscapes.umbral_flesh_block": "Chair éclipsée", + "item.cinderscapes.umbral_fungus": "Champignon éclipsé", + "item.cinderscapes.umbral_hyphae": "Hyphes éclipsées", + "item.cinderscapes.umbral_nylium": "Nylium éclipsé", + "item.cinderscapes.umbral_planks": "Planches éclipsées", + "item.cinderscapes.umbral_pressure_plate": "Plaque de pression éclipsée", + "item.cinderscapes.umbral_sign": "Pancarte éclipsée", + "item.cinderscapes.umbral_slab": "Dalle éclipsée", + "item.cinderscapes.umbral_stairs": "Escalier éclipsé", + "item.cinderscapes.umbral_stem": "Tige éclipsée", + "item.cinderscapes.umbral_trapdoor": "Trappe éclipsée", + "item.cinderscapes.umbral_wart_block": "Bloc de verrues éclipsées" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json b/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json index 31e94b69..2823204f 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json +++ b/client/src/main/resources/assets/cinderscapes/lang/pl_pl.json @@ -1,26 +1,80 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Ruda siarki", - "block.cinderscapes.sulfur_block": "Blok siarki", - "item.cinderscapes.sulfur": "Siarka", - - "item.cinderscapes.bramble_berries": "Kolczaste jagody", - "block.cinderscapes.bramble_berry_bush": "Krzak jeżyn", - + "biome.cinderscapes.ashy_shoals": "Popielne płycizny", + "biome.cinderscapes.blackstone_shales": "Czernitowe łupki", "biome.cinderscapes.luminous_grove": "Świetlany gaj", + "biome.cinderscapes.quartz_cavern": "Kwarcowy kanion", + "block.cinderscapes.ash": "Popiół", + "block.cinderscapes.ash_block": "Blok popiołu", + "block.cinderscapes.bramble_berry_bush": "Krzak jeżyn", + "block.cinderscapes.chiseled_rose_quartz_block": "Rzeźbiony blok różanego kwarcu", + "block.cinderscapes.chiseled_smoky_quartz_block": "Rzeźbiony blok dymionego kwarcu", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Rzeźbiony blok siarkowego kwarcu", + "block.cinderscapes.crystalline_quartz": "Krystaliczny kwarc", + "block.cinderscapes.crystalline_rose_quartz": "Krystaliczny różany kwarc", + "block.cinderscapes.crystalline_smoky_quartz": "Krystaliczny dymiony kwarc", + "block.cinderscapes.crystalline_sulfur_quartz": "Krystaliczny siarkowy kwarc", + "block.cinderscapes.crystinium": "Krysztynium", + "block.cinderscapes.ghastly_ectoplasm": "Upiorna ektoplazma", "block.cinderscapes.luminous_pod": "Świetlny strąk", - - "block.cinderscapes.twilight_tendrils": "Wić zmierzchu", - "block.cinderscapes.twilight_fescues": "Kostrzewa zmierzchu", - "block.cinderscapes.twilight_vine_block": "Blok pnącz zmierzchu", - "block.cinderscapes.photofern": "Grzybopaproć", - "block.cinderscapes.tall_photofern": "Wysoka grzybopaproć", - + "block.cinderscapes.polypite_quartz": "Polipitowy kwarc", + "block.cinderscapes.polypite_rose_quartz": "Polipitowy różany kwarc", + "block.cinderscapes.polypite_smoky_quartz": "Polipitowy dymiony kwarc", + "block.cinderscapes.polypite_sulfur_quartz": "Polopitowy siarkowy kwarc", + "block.cinderscapes.pyracinth": "Ognisty hiacynt", + "block.cinderscapes.rose_quartz_block": "Blok różanego kwarcu", + "block.cinderscapes.rose_quartz_bricks": "Różane kwarcowe cegły", + "block.cinderscapes.rose_quartz_ore": "Ruda różanego kwarcu", + "block.cinderscapes.rose_quartz_pillar": "Różany kwarcowy filar", + "block.cinderscapes.rose_quartz_slab": "Różana kwarcowa płyta", + "block.cinderscapes.rose_quartz_stairs": "Różane kwarcowe schody", + "block.cinderscapes.scorched_button": "Przypalony przycisk", + "block.cinderscapes.scorched_door": "Przypalone drzwi", + "block.cinderscapes.scorched_fence": "Przypalony płot", + "block.cinderscapes.scorched_fence_gate": "Przypalona furtka", + "block.cinderscapes.scorched_hyphae": "Przypalone strzępki", + "block.cinderscapes.scorched_planks": "Przypalone deski", + "block.cinderscapes.scorched_pressure_plate": "Przypalona płyta naciskowa", + "block.cinderscapes.scorched_shrub": "Przypalony krzak", + "block.cinderscapes.scorched_sign": "Przypalony znak", + "block.cinderscapes.scorched_slab": "Przypalona płyta", + "block.cinderscapes.scorched_sprouts": "Przypalone kiełki", + "block.cinderscapes.scorched_stairs": "Przypalone schody", + "block.cinderscapes.scorched_stem": "Przypalony trzon", + "block.cinderscapes.scorched_tendrils": "Przypalone wicie", + "block.cinderscapes.scorched_trapdoor": "Przypalona klapa", + "block.cinderscapes.smoky_quartz_block": "Blok dymionego kwarcu", + "block.cinderscapes.smoky_quartz_bricks": "Dymione kwarcowe cegły", + "block.cinderscapes.smoky_quartz_ore": "Ruda dymionego kwarcu", + "block.cinderscapes.smoky_quartz_pillar": "Dymiony kwarcowy filar", + "block.cinderscapes.smoky_quartz_slab": "Dymiona kwarcowa płyta", + "block.cinderscapes.smoky_quartz_stairs": "Dymione kwarcowe schody", + "block.cinderscapes.smooth_rose_quartz": "Głądki różany kwarc", + "block.cinderscapes.smooth_rose_quartz_slab": "Gładka różana kwarcowa płyta", + "block.cinderscapes.smooth_rose_quartz_stairs": "Głądkie różane kwarcowe schody", + "block.cinderscapes.smooth_smoky_quartz": "Gładki dymiony kwarc", + "block.cinderscapes.smooth_smoky_quartz_slab": "Gładka dymiona kwarcowa płyta", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Gładkie dymione kwarcowe schody", + "block.cinderscapes.smooth_sulfur_quartz": "Gładki siarkowy kwarc", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Gładka siarkowa kwarcowa płyta", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Gładkie siarkowe kwarcowe schody", + "block.cinderscapes.stripped_scorched_hyphae": "Okorowane przypalone strzępki", + "block.cinderscapes.stripped_scorched_stem": "Okorowany przypalony trzon", "block.cinderscapes.stripped_umbral_hyphae": "Okorowane umbralne strzępki", "block.cinderscapes.stripped_umbral_stem": "Okorowany umbralny trzon", + "block.cinderscapes.sulfur_block": "Blok siarki", + "block.cinderscapes.sulfur_ore": "Ruda siarki", + "block.cinderscapes.sulfur_quartz_block": "Blok siarkowego kwarcu", + "block.cinderscapes.sulfur_quartz_bricks": "Siarkowe kwarcowe cegły", + "block.cinderscapes.sulfur_quartz_ore": "Ruda siarkowego kwarcu", + "block.cinderscapes.sulfur_quartz_pillar": "Siarkowy kwarcowy filar", + "block.cinderscapes.sulfur_quartz_slab": "Siarkowa kwarcowa płyta", + "block.cinderscapes.sulfur_quartz_stairs": "Siarkowe kwarcowe schody", + "block.cinderscapes.tall_photofern": "Wysoka grzybopaproć", + "block.cinderscapes.twilight_fescues": "Kostrzewa zmierzchu", + "block.cinderscapes.twilight_tendrils": "Wić zmierzchu", + "block.cinderscapes.twilight_vine_block": "Blok pnącz zmierzchu", "block.cinderscapes.umbral_button": "Umbralny przycisk", "block.cinderscapes.umbral_door": "Umbralne drzwi", "block.cinderscapes.umbral_fence": "Umbralny płot", @@ -38,82 +92,99 @@ "block.cinderscapes.umbral_trapdoor": "Umbralna klapa", "block.cinderscapes.umbral_wart_block": "Blok umbralnej brodawki", - "block.cinderscapes.ghastly_ectoplasm": "Upiorna ektoplazma", - - "biome.cinderscapes.quartz_cavern": "Kwarcowy kanion", - - "block.cinderscapes.crystinium": "Krysztynium", - - "block.cinderscapes.polypite_quartz": "Polipitowy kwarc", - "block.cinderscapes.crystalline_quartz": "Krystaliczny kwarc", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Rzeźbiony blok siarkowego kwarcu", - "block.cinderscapes.crystalline_sulfur_quartz": "Krystaliczny siarkowy kwarc", - "block.cinderscapes.polypite_sulfur_quartz": "Polopitowy siarkowy kwarc", - "block.cinderscapes.smooth_sulfur_quartz": "Gładki siarkowy kwarc", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Gładka siarkowa kwarcowa płyta", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Gładkie siarkowe kwarcowe schody", - "block.cinderscapes.sulfur_quartz_block": "Blok siarkowego kwarcu", - "block.cinderscapes.sulfur_quartz_bricks": "Siarkowe kwarcowe cegły", - "block.cinderscapes.sulfur_quartz_ore": "Ruda siarkowego kwarcu", - "block.cinderscapes.sulfur_quartz_pillar": "Siarkowy kwarcowy filar", - "block.cinderscapes.sulfur_quartz_slab": "Siarkowa kwarcowa płyta", - "block.cinderscapes.sulfur_quartz_stairs": "Siarkowe kwarcowe schody", - "item.cinderscapes.sulfur_quartz": "Siarkowy kwarc", + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Sterta popiołu", + "item.cinderscapes.bramble_berries": "Kolczaste jagody", + "item.cinderscapes.sulfur": "Siarka", - "block.cinderscapes.chiseled_rose_quartz_block": "Rzeźbiony blok różanego kwarcu", - "block.cinderscapes.crystalline_rose_quartz": "Krystaliczny różany kwarc", - "block.cinderscapes.polypite_rose_quartz": "Polipitowy różany kwarc", - "block.cinderscapes.rose_quartz_block": "Blok różanego kwarcu", - "block.cinderscapes.rose_quartz_bricks": "Różane kwarcowe cegły", - "block.cinderscapes.rose_quartz_ore": "Ruda różanego kwarcu", - "block.cinderscapes.rose_quartz_pillar": "Różany kwarcowy filar", - "block.cinderscapes.rose_quartz_slab": "Różana kwarcowa płyta", - "block.cinderscapes.rose_quartz_stairs": "Różane kwarcowe schody", - "block.cinderscapes.smooth_rose_quartz": "Głądki różany kwarc", - "block.cinderscapes.smooth_rose_quartz_slab": "Gładka różana kwarcowa płyta", - "block.cinderscapes.smooth_rose_quartz_stairs": "Głądkie różane kwarcowe schody", "item.cinderscapes.rose_quartz": "Różany kwarc", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Rzeźbiony blok dymionego kwarcu", - "block.cinderscapes.crystalline_smoky_quartz": "Krystaliczny dymiony kwarc", - "block.cinderscapes.polypite_smoky_quartz": "Polipitowy dymiony kwarc", - "block.cinderscapes.smoky_quartz_block": "Blok dymionego kwarcu", - "block.cinderscapes.smoky_quartz_bricks": "Dymione kwarcowe cegły", - "block.cinderscapes.smoky_quartz_ore": "Ruda dymionego kwarcu", - "block.cinderscapes.smoky_quartz_pillar": "Dymiony kwarcowy filar", - "block.cinderscapes.smoky_quartz_slab": "Dymiona kwarcowa płyta", - "block.cinderscapes.smoky_quartz_stairs": "Dymione kwarcowe schody", - "block.cinderscapes.smooth_smoky_quartz": "Gładki dymiony kwarc", - "block.cinderscapes.smooth_smoky_quartz_slab": "Gładka dymiona kwarcowa płyta", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Gładkie dymione kwarcowe schody", "item.cinderscapes.smoky_quartz": "Dymiony kwarc", + "item.cinderscapes.sulfur_quartz": "Siarkowy kwarc", - "biome.cinderscapes.blackstone_shales": "Czernitowe łupki", - - "biome.cinderscapes.ashy_shoals": "Popielne płycizny", - - "block.cinderscapes.scorched_shrub": "Przypalony krzak", - "block.cinderscapes.scorched_sprouts": "Przypalone kiełki", - "block.cinderscapes.scorched_tendrils": "Przypalone wicie", - "block.cinderscapes.pyracinth": "Ognisty hiacynt", - - "item.cinderscapes.ash_pile": "Sterta popiołu", - "block.cinderscapes.ash": "Popiół", - "block.cinderscapes.ash_block": "Blok popiołu", - - "block.cinderscapes.scorched_button": "Przypalony przycisk", - "block.cinderscapes.scorched_door": "Przypalone drzwi", - "block.cinderscapes.scorched_fence": "Przypalony płot", - "block.cinderscapes.scorched_fence_gate": "Przypalona furtka", - "block.cinderscapes.scorched_hyphae": "Przypalone strzępki", - "block.cinderscapes.scorched_planks": "Przypalone deski", - "block.cinderscapes.scorched_pressure_plate": "Przypalona płyta naciskowa", - "block.cinderscapes.scorched_sign": "Przypalony znak", - "block.cinderscapes.scorched_slab": "Przypalona płyta", - "block.cinderscapes.scorched_stairs": "Przypalone schody", - "block.cinderscapes.scorched_stem": "Przypalony trzon", - "block.cinderscapes.scorched_trapdoor": "Przypalona klapa", - "block.cinderscapes.stripped_scorched_hyphae": "Okorowane przypalone strzępki", - "block.cinderscapes.stripped_scorched_stem": "Okorowany przypalony trzon" + "item.cinderscapes.ash": "Popiół", + "item.cinderscapes.ash_block": "Blok popiołu", + "item.cinderscapes.chiseled_rose_quartz_block": "Rzeźbiony blok różanego kwarcu", + "item.cinderscapes.chiseled_smoky_quartz_block": "Rzeźbiony blok dymionego kwarcu", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Rzeźbiony blok siarkowego kwarcu", + "item.cinderscapes.crystalline_quartz": "Krystaliczny kwarc", + "item.cinderscapes.crystalline_rose_quartz": "Krystaliczny różany kwarc", + "item.cinderscapes.crystalline_smoky_quartz": "Krystaliczny dymiony kwarc", + "item.cinderscapes.crystalline_sulfur_quartz": "Krystaliczny siarkowy kwarc", + "item.cinderscapes.crystinium": "Krysztynium", + "item.cinderscapes.ghastly_ectoplasm": "Upiorna ektoplazma", + "item.cinderscapes.luminous_pod": "Świetlny strąk", + "item.cinderscapes.photofern": "Grzybopaproć", + "item.cinderscapes.polypite_quartz": "Polipitowy kwarc", + "item.cinderscapes.polypite_rose_quartz": "Polipitowy różany kwarc", + "item.cinderscapes.polypite_smoky_quartz": "Polipitowy dymiony kwarc", + "item.cinderscapes.polypite_sulfur_quartz": "Polopitowy siarkowy kwarc", + "item.cinderscapes.pyracinth": "Ognisty hiacynt", + "item.cinderscapes.rose_quartz_block": "Blok różanego kwarcu", + "item.cinderscapes.rose_quartz_bricks": "Różane kwarcowe cegły", + "item.cinderscapes.rose_quartz_ore": "Ruda różanego kwarcu", + "item.cinderscapes.rose_quartz_pillar": "Różany kwarcowy filar", + "item.cinderscapes.rose_quartz_slab": "Różana kwarcowa płyta", + "item.cinderscapes.rose_quartz_stairs": "Różane kwarcowe schody", + "item.cinderscapes.scorched_button": "Przypalony przycisk", + "item.cinderscapes.scorched_door": "Przypalone drzwi", + "item.cinderscapes.scorched_fence": "Przypalony płot", + "item.cinderscapes.scorched_fence_gate": "Przypalona furtka", + "item.cinderscapes.scorched_hyphae": "Przypalone strzępki", + "item.cinderscapes.scorched_planks": "Przypalone deski", + "item.cinderscapes.scorched_pressure_plate": "Przypalona płyta naciskowa", + "item.cinderscapes.scorched_shrub": "Przypalony krzak", + "item.cinderscapes.scorched_sign": "Przypalony znak", + "item.cinderscapes.scorched_slab": "Przypalona płyta", + "item.cinderscapes.scorched_sprouts": "Przypalone kiełki", + "item.cinderscapes.scorched_stairs": "Przypalone schody", + "item.cinderscapes.scorched_stem": "Przypalony trzon", + "item.cinderscapes.scorched_tendrils": "Przypalone wicie", + "item.cinderscapes.scorched_trapdoor": "Przypalona klapa", + "item.cinderscapes.smoky_quartz_block": "Blok dymionego kwarcu", + "item.cinderscapes.smoky_quartz_bricks": "Dymione kwarcowe cegły", + "item.cinderscapes.smoky_quartz_ore": "Ruda dymionego kwarcu", + "item.cinderscapes.smoky_quartz_pillar": "Dymiony kwarcowy filar", + "item.cinderscapes.smoky_quartz_slab": "Dymiona kwarcowa płyta", + "item.cinderscapes.smoky_quartz_stairs": "Dymione kwarcowe schody", + "item.cinderscapes.smooth_rose_quartz": "Głądki różany kwarc", + "item.cinderscapes.smooth_rose_quartz_slab": "Gładka różana kwarcowa płyta", + "item.cinderscapes.smooth_rose_quartz_stairs": "Głądkie różane kwarcowe schody", + "item.cinderscapes.smooth_smoky_quartz": "Gładki dymiony kwarc", + "item.cinderscapes.smooth_smoky_quartz_slab": "Gładka dymiona kwarcowa płyta", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Gładkie dymione kwarcowe schody", + "item.cinderscapes.smooth_sulfur_quartz": "Gładki siarkowy kwarc", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Gładka siarkowa kwarcowa płyta", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Gładkie siarkowe kwarcowe schody", + "item.cinderscapes.stripped_scorched_hyphae": "Okorowane przypalone strzępki", + "item.cinderscapes.stripped_scorched_stem": "Okorowany przypalony trzon", + "item.cinderscapes.stripped_umbral_hyphae": "Okorowane umbralne strzępki", + "item.cinderscapes.stripped_umbral_stem": "Okorowany umbralny trzon", + "item.cinderscapes.sulfur_block": "Blok siarki", + "item.cinderscapes.sulfur_ore": "Ruda siarki", + "item.cinderscapes.sulfur_quartz_block": "Blok siarkowego kwarcu", + "item.cinderscapes.sulfur_quartz_bricks": "Siarkowe kwarcowe cegły", + "item.cinderscapes.sulfur_quartz_ore": "Ruda siarkowego kwarcu", + "item.cinderscapes.sulfur_quartz_pillar": "Siarkowy kwarcowy filar", + "item.cinderscapes.sulfur_quartz_slab": "Siarkowa kwarcowa płyta", + "item.cinderscapes.sulfur_quartz_stairs": "Siarkowe kwarcowe schody", + "item.cinderscapes.tall_photofern": "Wysoka grzybopaproć", + "item.cinderscapes.twilight_fescues": "Kostrzewa zmierzchu", + "item.cinderscapes.twilight_tendrils": "Wić zmierzchu", + "item.cinderscapes.twilight_vine_block": "Blok pnącz zmierzchu", + "item.cinderscapes.umbral_button": "Umbralny przycisk", + "item.cinderscapes.umbral_door": "Umbralne drzwi", + "item.cinderscapes.umbral_fence": "Umbralny płot", + "item.cinderscapes.umbral_fence_gate": "Umbralna furtka", + "item.cinderscapes.umbral_flesh_block": "Blok umbralnego mięsa", + "item.cinderscapes.umbral_fungus": "Umbralny grzyb", + "item.cinderscapes.umbral_hyphae": "Umbralne strzępki", + "item.cinderscapes.umbral_nylium": "Umbralne nylium", + "item.cinderscapes.umbral_planks": "Umbralne deski", + "item.cinderscapes.umbral_pressure_plate": "Umbralna płyta naciskowa", + "item.cinderscapes.umbral_sign": "Umbralny znak", + "item.cinderscapes.umbral_slab": "Umbralna płyta", + "item.cinderscapes.umbral_stairs": "Umbralne schody", + "item.cinderscapes.umbral_stem": "Umbralny trzon", + "item.cinderscapes.umbral_trapdoor": "Umbralna klapa", + "item.cinderscapes.umbral_wart_block": "Blok umbralnej brodawki" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/pt_br.json b/client/src/main/resources/assets/cinderscapes/lang/pt_br.json index 3a42395f..e8687e6c 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/pt_br.json +++ b/client/src/main/resources/assets/cinderscapes/lang/pt_br.json @@ -1,107 +1,34 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Minério de enxofre", - "block.cinderscapes.sulfur_block": "Bloco de enxofre", - "item.cinderscapes.sulfur": "Enxofre", - - "item.cinderscapes.bramble_berries": "Bagas-chamusquentas", - "block.cinderscapes.bramble_berry_bush": "Arbusto de bagas-chamusquentas", - + "biome.cinderscapes.ashy_shoals": "Depósitos de cinzas", + "biome.cinderscapes.blackstone_shales": "Folhelos de pedra-negra", "biome.cinderscapes.luminous_grove": "Bosque luminoso", - - "block.cinderscapes.luminous_pod": "Vagem-luminosa", - - "block.cinderscapes.twilight_tendrils": "Gavinhas crepusculares", - "block.cinderscapes.twilight_fescues": "Festucas crepusculares", - "block.cinderscapes.twilight_vine_block": "Bloco de trepadeira crepuscular", - - "block.cinderscapes.photofern": "Photomambaia", - "block.cinderscapes.tall_photofern": "Photomambaia alta", - - "block.cinderscapes.stripped_umbral_hyphae": "Hifas umbráticas descascadas", - "block.cinderscapes.stripped_umbral_stem": "Caule umbrático descascado", - "block.cinderscapes.umbral_button": "Botão umbrático", - "block.cinderscapes.umbral_door": "Porta umbrática", - "block.cinderscapes.umbral_fence": "Cerca umbrática", - "block.cinderscapes.umbral_fence_gate": "Portão umbrático", - "block.cinderscapes.umbral_flesh_block": "Himênio de fungo umbrático", - "block.cinderscapes.umbral_fungus": "Fungo umbrático", - "block.cinderscapes.umbral_hyphae": "Hifas umbráticas", - "block.cinderscapes.umbral_nylium": "Nicélio umbrático", - "block.cinderscapes.umbral_planks": "Tábuas umbráticas", - "block.cinderscapes.umbral_pressure_plate": "Placa de pressão umbrática", - "block.cinderscapes.umbral_sign": "Placa umbrática", - "block.cinderscapes.umbral_slab": "Laje umbrática", - "block.cinderscapes.umbral_stairs": "Escadas umbráticas", - "block.cinderscapes.umbral_stem": "Caule umbrático", - "block.cinderscapes.umbral_trapdoor": "Alçapão umbrático", - "block.cinderscapes.umbral_wart_block": "Bloco de fungo umbrático", - - "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma medonho", - "biome.cinderscapes.quartz_cavern": "Cânions de quartzo", - "block.cinderscapes.crystinium": "Cristíneo", - - "block.cinderscapes.polypite_quartz": "Agregado de quartzo", - "block.cinderscapes.crystalline_quartz": "Quartzo cristalino", - - "block.cinderscapes.chiseled_sulfur_quartz_block": "Bloco de quartzo-enxofre talhado", - "block.cinderscapes.crystalline_sulfur_quartz": "Quartzo-enxofre cristalino", - "block.cinderscapes.polypite_sulfur_quartz": "Agregado de quartzo-enxofre", - "block.cinderscapes.smooth_sulfur_quartz": "Bloco de quartzo-enxofre liso", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Laje de quartzo-enxofre liso", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escadas de quartzo-enxofre liso", - "block.cinderscapes.sulfur_quartz_block": "Bloco de quartzo-enxofre", - "block.cinderscapes.sulfur_quartz_bricks": "Tijolos de quartzo-enxofre", - "block.cinderscapes.sulfur_quartz_ore": "Minério de quartzo-enxofre", - "block.cinderscapes.sulfur_quartz_pillar": "Pilar de quartzo-enxofre", - "block.cinderscapes.sulfur_quartz_slab": "Laje de quartzo-enxofre", - "block.cinderscapes.sulfur_quartz_stairs": "Escadas de quartzo-enxofre", - "item.cinderscapes.sulfur_quartz": "Quartzo-enxofre", - + "block.cinderscapes.ash": "Cinzas", + "block.cinderscapes.ash_block": "Bloco de cinzas", + "block.cinderscapes.bramble_berry_bush": "Arbusto de bagas-chamusquentas", "block.cinderscapes.chiseled_rose_quartz_block": "Bloco de quartzo róseo talhado", + "block.cinderscapes.chiseled_smoky_quartz_block": "Bloco de quartzo fumê talhado", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Bloco de quartzo-enxofre talhado", + "block.cinderscapes.crystalline_quartz": "Quartzo cristalino", "block.cinderscapes.crystalline_rose_quartz": "Quartzo róseo cristalino", + "block.cinderscapes.crystalline_smoky_quartz": "Quartzo fumê cristalino", + "block.cinderscapes.crystalline_sulfur_quartz": "Quartzo-enxofre cristalino", + "block.cinderscapes.crystinium": "Cristíneo", + "block.cinderscapes.ghastly_ectoplasm": "Ectoplasma medonho", + "block.cinderscapes.luminous_pod": "Vagem-luminosa", + "block.cinderscapes.photofern": "Photomambaia", + "block.cinderscapes.polypite_quartz": "Agregado de quartzo", "block.cinderscapes.polypite_rose_quartz": "Agregado de quartzo róseo", + "block.cinderscapes.polypite_smoky_quartz": "Agregado de quartzo fumê", + "block.cinderscapes.polypite_sulfur_quartz": "Agregado de quartzo-enxofre", + "block.cinderscapes.pyracinth": "Piracinto", "block.cinderscapes.rose_quartz_block": "Bloco de quartzo róseo", "block.cinderscapes.rose_quartz_bricks": "Tijolos de quartzo róseo", "block.cinderscapes.rose_quartz_ore": "Minério de quartzo róseo", "block.cinderscapes.rose_quartz_pillar": "Pilar de quartzo róseo", "block.cinderscapes.rose_quartz_slab": "Laje de quartzo róseo", "block.cinderscapes.rose_quartz_stairs": "Escadas de quartzo róseo", - "block.cinderscapes.smooth_rose_quartz": "Bloco de quatzo róseo liso", - "block.cinderscapes.smooth_rose_quartz_slab": "Laje de quartzo róseo liso", - "block.cinderscapes.smooth_rose_quartz_stairs": "Escadas de quartzo róseo liso", - "item.cinderscapes.rose_quartz": "Quartzo róseo", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Bloco de quartzo fumê talhado", - "block.cinderscapes.crystalline_smoky_quartz": "Quartzo fumê cristalino", - "block.cinderscapes.polypite_smoky_quartz": "Agregado de quartzo fumê", - "block.cinderscapes.smoky_quartz_block": "Bloco de quartzo fumê", - "block.cinderscapes.smoky_quartz_bricks": "Tijolos de quartzo fumê", - "block.cinderscapes.smoky_quartz_ore": "Minério de quartzo fumê", - "block.cinderscapes.smoky_quartz_pillar": "Pilar de quartzo fumê", - "block.cinderscapes.smoky_quartz_slab": "Laje de quartzo fumê", - "block.cinderscapes.smoky_quartz_stairs": "Escadas de quartzo fumê", - "block.cinderscapes.smooth_smoky_quartz": "Bloco de quartzo fumê liso", - "block.cinderscapes.smooth_smoky_quartz_slab": "Laje de quartzo fumê liso", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Escadas de quartzo fumê liso", - "item.cinderscapes.smoky_quartz": "Quartzo fumê", - - "biome.cinderscapes.blackstone_shales": "Folhelos de pedra-negra", - - "biome.cinderscapes.ashy_shoals": "Depósitos de cinzas", - - "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", - "block.cinderscapes.scorched_sprouts": "Brotos chamuscados", - "block.cinderscapes.scorched_tendrils": "Gavinhas chamuscadas", - "block.cinderscapes.pyracinth": "Piracinto", - - "item.cinderscapes.ash_pile": "Pilha de cinzas", - "block.cinderscapes.ash": "Cinzas", - "block.cinderscapes.ash_block": "Bloco de cinzas", - "block.cinderscapes.scorched_button": "Botão chamuscado", "block.cinderscapes.scorched_door": "Porta chamuscada", "block.cinderscapes.scorched_fence": "Cerca chamuscada", @@ -109,19 +36,163 @@ "block.cinderscapes.scorched_hyphae": "Hifas chamuscadas", "block.cinderscapes.scorched_planks": "Tábuas chamuscadas", "block.cinderscapes.scorched_pressure_plate": "Placa de pressão chamuscada", + "block.cinderscapes.scorched_shrub": "Arbusto chamuscado", "block.cinderscapes.scorched_sign": "Placa chamuscada", "block.cinderscapes.scorched_slab": "Laje chamuscada", + "block.cinderscapes.scorched_sprouts": "Brotos chamuscados", "block.cinderscapes.scorched_stairs": "Escadas chamuscadas", "block.cinderscapes.scorched_stem": "Caule chamuscado", + "block.cinderscapes.scorched_tendrils": "Gavinhas chamuscadas", "block.cinderscapes.scorched_trapdoor": "Alçapão chamuscado", + "block.cinderscapes.smoky_quartz_block": "Bloco de quartzo fumê", + "block.cinderscapes.smoky_quartz_bricks": "Tijolos de quartzo fumê", + "block.cinderscapes.smoky_quartz_ore": "Minério de quartzo fumê", + "block.cinderscapes.smoky_quartz_pillar": "Pilar de quartzo fumê", + "block.cinderscapes.smoky_quartz_slab": "Laje de quartzo fumê", + "block.cinderscapes.smoky_quartz_stairs": "Escadas de quartzo fumê", + "block.cinderscapes.smooth_rose_quartz": "Bloco de quatzo róseo liso", + "block.cinderscapes.smooth_rose_quartz_slab": "Laje de quartzo róseo liso", + "block.cinderscapes.smooth_rose_quartz_stairs": "Escadas de quartzo róseo liso", + "block.cinderscapes.smooth_smoky_quartz": "Bloco de quartzo fumê liso", + "block.cinderscapes.smooth_smoky_quartz_slab": "Laje de quartzo fumê liso", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Escadas de quartzo fumê liso", + "block.cinderscapes.smooth_sulfur_quartz": "Bloco de quartzo-enxofre liso", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Laje de quartzo-enxofre liso", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Escadas de quartzo-enxofre liso", "block.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas descascadas", "block.cinderscapes.stripped_scorched_stem": "Caule chamuscado descascado", + "block.cinderscapes.stripped_umbral_hyphae": "Hifas umbráticas descascadas", + "block.cinderscapes.stripped_umbral_stem": "Caule umbrático descascado", + "block.cinderscapes.sulfur_block": "Bloco de enxofre", + "block.cinderscapes.sulfur_ore": "Minério de enxofre", + "block.cinderscapes.sulfur_quartz_block": "Bloco de quartzo-enxofre", + "block.cinderscapes.sulfur_quartz_bricks": "Tijolos de quartzo-enxofre", + "block.cinderscapes.sulfur_quartz_ore": "Minério de quartzo-enxofre", + "block.cinderscapes.sulfur_quartz_pillar": "Pilar de quartzo-enxofre", + "block.cinderscapes.sulfur_quartz_slab": "Laje de quartzo-enxofre", + "block.cinderscapes.sulfur_quartz_stairs": "Escadas de quartzo-enxofre", + "block.cinderscapes.tall_photofern": "Photomambaia alta", + "block.cinderscapes.twilight_fescues": "Festucas crepusculares", + "block.cinderscapes.twilight_tendrils": "Gavinhas crepusculares", + "block.cinderscapes.twilight_vine_block": "Bloco de trepadeira crepuscular", + "block.cinderscapes.umbral_button": "Botão umbrático", + "block.cinderscapes.umbral_door": "Porta umbrática", + "block.cinderscapes.umbral_fence": "Cerca umbrática", + "block.cinderscapes.umbral_fence_gate": "Portão umbrático", + "block.cinderscapes.umbral_flesh_block": "Himênio de fungo umbrático", + "block.cinderscapes.umbral_fungus": "Fungo umbrático", + "block.cinderscapes.umbral_hyphae": "Hifas umbráticas", + "block.cinderscapes.umbral_nylium": "Nicélio umbrático", + "block.cinderscapes.umbral_planks": "Tábuas umbráticas", + "block.cinderscapes.umbral_pressure_plate": "Placa de pressão umbrática", + "block.cinderscapes.umbral_sign": "Placa umbrática", + "block.cinderscapes.umbral_slab": "Laje umbrática", + "block.cinderscapes.umbral_stairs": "Escadas umbráticas", + "block.cinderscapes.umbral_stem": "Caule umbrático", + "block.cinderscapes.umbral_trapdoor": "Alçapão umbrático", + "block.cinderscapes.umbral_wart_block": "Bloco de fungo umbrático", + + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Pilha de cinzas", + "item.cinderscapes.bramble_berries": "Bagas-chamusquentas", + "item.cinderscapes.sulfur": "Enxofre", + + "item.cinderscapes.rose_quartz": "Quartzo róseo", + "item.cinderscapes.smoky_quartz": "Quartzo fumê", + "item.cinderscapes.sulfur_quartz": "Quartzo-enxofre", "item.cinderscapes.music_disc_chilling_in_hell": "Disco de música", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Disco de música", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Cinzas", + "item.cinderscapes.ash_block": "Bloco de cinzas", + "item.cinderscapes.chiseled_rose_quartz_block": "Bloco de quartzo róseo talhado", + "item.cinderscapes.chiseled_smoky_quartz_block": "Bloco de quartzo fumê talhado", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Bloco de quartzo-enxofre talhado", + "item.cinderscapes.crystalline_quartz": "Quartzo cristalino", + "item.cinderscapes.crystalline_rose_quartz": "Quartzo róseo cristalino", + "item.cinderscapes.crystalline_smoky_quartz": "Quartzo fumê cristalino", + "item.cinderscapes.crystalline_sulfur_quartz": "Quartzo-enxofre cristalino", + "item.cinderscapes.crystinium": "Cristíneo", + "item.cinderscapes.ghastly_ectoplasm": "Ectoplasma medonho", + "item.cinderscapes.luminous_pod": "Vagem-luminosa", + "item.cinderscapes.photofern": "Photomambaia", + "item.cinderscapes.polypite_quartz": "Agregado de quartzo", + "item.cinderscapes.polypite_rose_quartz": "Agregado de quartzo róseo", + "item.cinderscapes.polypite_smoky_quartz": "Agregado de quartzo fumê", + "item.cinderscapes.polypite_sulfur_quartz": "Agregado de quartzo-enxofre", + "item.cinderscapes.pyracinth": "Piracinto", + "item.cinderscapes.rose_quartz_block": "Bloco de quartzo róseo", + "item.cinderscapes.rose_quartz_bricks": "Tijolos de quartzo róseo", + "item.cinderscapes.rose_quartz_ore": "Minério de quartzo róseo", + "item.cinderscapes.rose_quartz_pillar": "Pilar de quartzo róseo", + "item.cinderscapes.rose_quartz_slab": "Laje de quartzo róseo", + "item.cinderscapes.rose_quartz_stairs": "Escadas de quartzo róseo", + "item.cinderscapes.scorched_button": "Botão chamuscado", + "item.cinderscapes.scorched_door": "Porta chamuscada", + "item.cinderscapes.scorched_fence": "Cerca chamuscada", + "item.cinderscapes.scorched_fence_gate": "Portão chamuscado", + "item.cinderscapes.scorched_hyphae": "Hifas chamuscadas", + "item.cinderscapes.scorched_planks": "Tábuas chamuscadas", + "item.cinderscapes.scorched_pressure_plate": "Placa de pressão chamuscada", + "item.cinderscapes.scorched_shrub": "Arbusto chamuscado", + "item.cinderscapes.scorched_sign": "Placa chamuscada", + "item.cinderscapes.scorched_slab": "Laje chamuscada", + "item.cinderscapes.scorched_sprouts": "Brotos chamuscados", + "item.cinderscapes.scorched_stairs": "Escadas chamuscadas", + "item.cinderscapes.scorched_stem": "Caule chamuscado", + "item.cinderscapes.scorched_tendrils": "Gavinhas chamuscadas", + "item.cinderscapes.scorched_trapdoor": "Alçapão chamuscado", + "item.cinderscapes.smoky_quartz_block": "Bloco de quartzo fumê", + "item.cinderscapes.smoky_quartz_bricks": "Tijolos de quartzo fumê", + "item.cinderscapes.smoky_quartz_ore": "Minério de quartzo fumê", + "item.cinderscapes.smoky_quartz_pillar": "Pilar de quartzo fumê", + "item.cinderscapes.smoky_quartz_slab": "Laje de quartzo fumê", + "item.cinderscapes.smoky_quartz_stairs": "Escadas de quartzo fumê", + "item.cinderscapes.smooth_rose_quartz": "Bloco de quatzo róseo liso", + "item.cinderscapes.smooth_rose_quartz_slab": "Laje de quartzo róseo liso", + "item.cinderscapes.smooth_rose_quartz_stairs": "Escadas de quartzo róseo liso", + "item.cinderscapes.smooth_smoky_quartz": "Bloco de quartzo fumê liso", + "item.cinderscapes.smooth_smoky_quartz_slab": "Laje de quartzo fumê liso", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Escadas de quartzo fumê liso", + "item.cinderscapes.smooth_sulfur_quartz": "Bloco de quartzo-enxofre liso", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Laje de quartzo-enxofre liso", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Escadas de quartzo-enxofre liso", + "item.cinderscapes.stripped_scorched_hyphae": "Hifas chamuscadas descascadas", + "item.cinderscapes.stripped_scorched_stem": "Caule chamuscado descascado", + "item.cinderscapes.stripped_umbral_hyphae": "Hifas umbráticas descascadas", + "item.cinderscapes.stripped_umbral_stem": "Caule umbrático descascado", + "item.cinderscapes.sulfur_block": "Bloco de enxofre", + "item.cinderscapes.sulfur_ore": "Minério de enxofre", + "item.cinderscapes.sulfur_quartz_block": "Bloco de quartzo-enxofre", + "item.cinderscapes.sulfur_quartz_bricks": "Tijolos de quartzo-enxofre", + "item.cinderscapes.sulfur_quartz_ore": "Minério de quartzo-enxofre", + "item.cinderscapes.sulfur_quartz_pillar": "Pilar de quartzo-enxofre", + "item.cinderscapes.sulfur_quartz_slab": "Laje de quartzo-enxofre", + "item.cinderscapes.sulfur_quartz_stairs": "Escadas de quartzo-enxofre", + "item.cinderscapes.tall_photofern": "Photomambaia alta", + "item.cinderscapes.twilight_fescues": "Festucas crepusculares", + "item.cinderscapes.twilight_tendrils": "Gavinhas crepusculares", + "item.cinderscapes.twilight_vine_block": "Bloco de trepadeira crepuscular", + "item.cinderscapes.umbral_button": "Botão umbrático", + "item.cinderscapes.umbral_door": "Porta umbrática", + "item.cinderscapes.umbral_fence": "Cerca umbrática", + "item.cinderscapes.umbral_fence_gate": "Portão umbrático", + "item.cinderscapes.umbral_flesh_block": "Himênio de fungo umbrático", + "item.cinderscapes.umbral_fungus": "Fungo umbrático", + "item.cinderscapes.umbral_hyphae": "Hifas umbráticas", + "item.cinderscapes.umbral_nylium": "Nicélio umbrático", + "item.cinderscapes.umbral_planks": "Tábuas umbráticas", + "item.cinderscapes.umbral_pressure_plate": "Placa de pressão umbrática", + "item.cinderscapes.umbral_sign": "Placa umbrática", + "item.cinderscapes.umbral_slab": "Laje umbrática", + "item.cinderscapes.umbral_stairs": "Escadas umbráticas", + "item.cinderscapes.umbral_stem": "Caule umbrático", + "item.cinderscapes.umbral_trapdoor": "Alçapão umbrático", + "item.cinderscapes.umbral_wart_block": "Bloco de fungo umbrático", + "text.autoconfig.cinderscapes.title": "Config. do Cinderscapes", "text.autoconfig.cinderscapes.option.biomes": "Modificar a geração de biomas", "text.autoconfig.cinderscapes.option.biomes.enableAshyShoals": "Permitir o bioma \"Depósitos de cinzas\"", diff --git a/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json b/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json index 20accad1..ee5e0f43 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json +++ b/client/src/main/resources/assets/cinderscapes/lang/ru_ru.json @@ -1,129 +1,208 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Серная руда", - "block.cinderscapes.sulfur_block": "Блок серы", - "item.cinderscapes.sulfur": "Сера", - - "item.cinderscapes.bramble_berries": "Ягоды ежевики", - "block.cinderscapes.bramble_berry_bush": "Куст ягоды ежевики", - + "biome.cinderscapes.ashy_shoals": "Пепельные косяки", + "biome.cinderscapes.blackstone_shales": "Чернитовые сланцы", "biome.cinderscapes.luminous_grove": "Светящаяся роща", + "biome.cinderscapes.quartz_cavern": "Кварцевый каньон", + "block.cinderscapes.ash": "Пепел", + "block.cinderscapes.ash_block": "Блок пепла", + "block.cinderscapes.bramble_berry_bush": "Куст ягоды ежевики", + "block.cinderscapes.chiseled_rose_quartz_block": "Резной блок розового кварца", + "block.cinderscapes.chiseled_smoky_quartz_block": "Резной блок дымчатого кварца", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Резной блок серного кварца", + "block.cinderscapes.crystalline_quartz": "Кристаллический кварц", + "block.cinderscapes.crystalline_rose_quartz": "Кристаллический розовый кварц", + "block.cinderscapes.crystalline_smoky_quartz": "Кристаллический дымчатый кварц", + "block.cinderscapes.crystalline_sulfur_quartz": "Кристаллический серный кварц", + "block.cinderscapes.crystinium": "Кристиниум", + "block.cinderscapes.ghastly_ectoplasm": "Призрачная эктоплазма", "block.cinderscapes.luminous_pod": "Светящийся стручок", - - "block.cinderscapes.twilight_tendrils": "Сумеречные завитки", - "block.cinderscapes.twilight_fescues": "Сумеречные фески", - "block.cinderscapes.twilight_vine_block": "Блок сумеречной лозы", - "block.cinderscapes.photofern": "Фотопапоротник", - "block.cinderscapes.tall_photofern": "Высокий фотопапоротник", - + "block.cinderscapes.polypite_quartz": "Полипит кварца", + "block.cinderscapes.polypite_rose_quartz": "Полипит розового кварца", + "block.cinderscapes.polypite_smoky_quartz": "Полипит дымчатого кварца", + "block.cinderscapes.polypite_sulfur_quartz": "Полипит серного кварца", + "block.cinderscapes.pyracinth": "Пирацинт", + "block.cinderscapes.rose_quartz_block": "Блок розового кварца", + "block.cinderscapes.rose_quartz_bricks": "Кирпичи из розового кварца", + "block.cinderscapes.rose_quartz_ore": "Руда розового кварца", + "block.cinderscapes.rose_quartz_pillar": "Пилон из розового кварца", + "block.cinderscapes.rose_quartz_slab": "Плита из розового кварца", + "block.cinderscapes.rose_quartz_stairs": "Ступеньки из розового кварца", + "block.cinderscapes.scorched_button": "Выжженная кнопка", + "block.cinderscapes.scorched_door": "Выжженная дверь", + "block.cinderscapes.scorched_fence": "Выжженный забор", + "block.cinderscapes.scorched_fence_gate": "Выжженная калитка", + "block.cinderscapes.scorched_hanging_sign": "Выжженная подвесная табличка", + "block.cinderscapes.scorched_hyphae": "Выжженные гифы", + "block.cinderscapes.scorched_planks": "Выжженные доски", + "block.cinderscapes.scorched_pressure_plate": "Выжженная нажимная плита", + "block.cinderscapes.scorched_shrub": "Выжженный куст", + "block.cinderscapes.scorched_sign": "Выжженная табличка", + "block.cinderscapes.scorched_slab": "Выжженная плита", + "block.cinderscapes.scorched_sprouts": "Выжженные ростки", + "block.cinderscapes.scorched_stairs": "Выжженные ступеньки", + "block.cinderscapes.scorched_stem": "Выжженный стебель", + "block.cinderscapes.scorched_tendrils": "Выжженные завитки", + "block.cinderscapes.scorched_trapdoor": "Выжженный люк", + "block.cinderscapes.smoky_quartz_block": "Блок дымчатого кварца", + "block.cinderscapes.smoky_quartz_bricks": "Кирпичи из дымчатого кварца", + "block.cinderscapes.smoky_quartz_ore": "Руда дымчатого кварца", + "block.cinderscapes.smoky_quartz_pillar": "Пилон из дымчатого кварца", + "block.cinderscapes.smoky_quartz_slab": "Плита из дымчатого кварца", + "block.cinderscapes.smoky_quartz_stairs": "Ступеньки из дымчатого кварца", + "block.cinderscapes.smooth_rose_quartz": "Гладкий розовый кварц", + "block.cinderscapes.smooth_rose_quartz_slab": "Плита из гладкого розового кварца", + "block.cinderscapes.smooth_rose_quartz_stairs": "Ступеньки из гладкого розового кварца", + "block.cinderscapes.smooth_smoky_quartz": "Гладкий дымчатый кварц", + "block.cinderscapes.smooth_smoky_quartz_slab": "Плита из гладкого дымчатого кварца", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Ступеньки из гладкого дымчатого кварца", + "block.cinderscapes.smooth_sulfur_quartz": "Гладкий серный кварц", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Плита из гладкого серного кварца", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Ступеньки из гладкого серного кварца", + "block.cinderscapes.stripped_scorched_hyphae": "Очищенные выжженные гифы", + "block.cinderscapes.stripped_scorched_stem": "Очищенный выжженный стебель", "block.cinderscapes.stripped_umbral_hyphae": "Очищенные мрачные гифы", "block.cinderscapes.stripped_umbral_stem": "Очищенный мрачный стебель", + "block.cinderscapes.sulfur_block": "Блок серы", + "block.cinderscapes.sulfur_ore": "Серная руда", + "block.cinderscapes.sulfur_quartz_block": "Блок серного кварца", + "block.cinderscapes.sulfur_quartz_bricks": "Кирпичи из серного кварца", + "block.cinderscapes.sulfur_quartz_ore": "Руда серного кварца", + "block.cinderscapes.sulfur_quartz_pillar": "Пилон из серного кварца", + "block.cinderscapes.sulfur_quartz_slab": "Плита из серного кварца", + "block.cinderscapes.sulfur_quartz_stairs": "Ступеньки из серного кварца", + "block.cinderscapes.tall_photofern": "Высокий фотопапоротник", + "block.cinderscapes.twilight_fescues": "Сумеречные фески", + "block.cinderscapes.twilight_tendrils": "Сумеречные завитки", + "block.cinderscapes.twilight_vine_block": "Блок сумеречной лозы", "block.cinderscapes.umbral_button": "Мрачная кнопка", "block.cinderscapes.umbral_door": "Мрачная дверь", "block.cinderscapes.umbral_fence": "Мрачный забор", "block.cinderscapes.umbral_fence_gate": "Мрачная калитка", "block.cinderscapes.umbral_flesh_block": "Блок мрачной плоти", "block.cinderscapes.umbral_fungus": "Мрачный гриб", + "block.cinderscapes.umbral_hanging_sign": "Мрачная подвесная табличка", "block.cinderscapes.umbral_hyphae": "Мрачные гифы", "block.cinderscapes.umbral_nylium": "Мрачный нилий", "block.cinderscapes.umbral_planks": "Мрачные доски", "block.cinderscapes.umbral_pressure_plate": "Мрачная нажимная плита", "block.cinderscapes.umbral_sign": "Мрачная табличка", - "block.cinderscapes.umbral_hanging_sign": "Мрачная подвесная табличка", "block.cinderscapes.umbral_slab": "Мрачная плита", "block.cinderscapes.umbral_stairs": "Мрачные ступеньки", "block.cinderscapes.umbral_stem": "Мрачный стебель", "block.cinderscapes.umbral_trapdoor": "Мрачный люк", "block.cinderscapes.umbral_wart_block": "Блок мрачного нароста", - "block.cinderscapes.ghastly_ectoplasm": "Призрачная эктоплазма", - - "biome.cinderscapes.quartz_cavern": "Кварцевый каньон", - - "block.cinderscapes.crystinium": "Кристиниум", - - "block.cinderscapes.polypite_quartz": "Полипит кварца", - "block.cinderscapes.crystalline_quartz": "Кристаллический кварц", + "block.cinderscapes.nodzol": "Нодзол", + "block.cinderscapes.nodzol.description": "Этот блок проклят...", - "block.cinderscapes.chiseled_sulfur_quartz_block": "Резной блок серного кварца", - "block.cinderscapes.crystalline_sulfur_quartz": "Кристаллический серный кварц", - "block.cinderscapes.polypite_sulfur_quartz": "Полипит серного кварца", - "block.cinderscapes.smooth_sulfur_quartz": "Гладкий серный кварц", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Плита из гладкого серного кварца", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Ступеньки из гладкого серного кварца", - "block.cinderscapes.sulfur_quartz_block": "Блок серного кварца", - "block.cinderscapes.sulfur_quartz_bricks": "Кирпичи из серного кварца", - "block.cinderscapes.sulfur_quartz_ore": "Руда серного кварца", - "block.cinderscapes.sulfur_quartz_pillar": "Пилон из серного кварца", - "block.cinderscapes.sulfur_quartz_slab": "Плита из серного кварца", - "block.cinderscapes.sulfur_quartz_stairs": "Ступеньки из серного кварца", - "item.cinderscapes.sulfur_quartz": "Серный кварц", + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Кучка пепла", + "item.cinderscapes.bramble_berries": "Ягоды ежевики", + "item.cinderscapes.sulfur": "Сера", - "block.cinderscapes.chiseled_rose_quartz_block": "Резной блок розового кварца", - "block.cinderscapes.crystalline_rose_quartz": "Кристаллический розовый кварц", - "block.cinderscapes.polypite_rose_quartz": "Полипит розового кварца", - "block.cinderscapes.rose_quartz_block": "Блок розового кварца", - "block.cinderscapes.rose_quartz_bricks": "Кирпичи из розового кварца", - "block.cinderscapes.rose_quartz_ore": "Руда розового кварца", - "block.cinderscapes.rose_quartz_pillar": "Пилон из розового кварца", - "block.cinderscapes.rose_quartz_slab": "Плита из розового кварца", - "block.cinderscapes.rose_quartz_stairs": "Ступеньки из розового кварца", - "block.cinderscapes.smooth_rose_quartz": "Гладкий розовый кварц", - "block.cinderscapes.smooth_rose_quartz_slab": "Плита из гладкого розового кварца", - "block.cinderscapes.smooth_rose_quartz_stairs": "Ступеньки из гладкого розового кварца", "item.cinderscapes.rose_quartz": "Розовый кварц", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Резной блок дымчатого кварца", - "block.cinderscapes.crystalline_smoky_quartz": "Кристаллический дымчатый кварц", - "block.cinderscapes.polypite_smoky_quartz": "Полипит дымчатого кварца", - "block.cinderscapes.smoky_quartz_block": "Блок дымчатого кварца", - "block.cinderscapes.smoky_quartz_bricks": "Кирпичи из дымчатого кварца", - "block.cinderscapes.smoky_quartz_ore": "Руда дымчатого кварца", - "block.cinderscapes.smoky_quartz_pillar": "Пилон из дымчатого кварца", - "block.cinderscapes.smoky_quartz_slab": "Плита из дымчатого кварца", - "block.cinderscapes.smoky_quartz_stairs": "Ступеньки из дымчатого кварца", - "block.cinderscapes.smooth_smoky_quartz": "Гладкий дымчатый кварц", - "block.cinderscapes.smooth_smoky_quartz_slab": "Плита из гладкого дымчатого кварца", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Ступеньки из гладкого дымчатого кварца", "item.cinderscapes.smoky_quartz": "Дымчатый кварц", - - "biome.cinderscapes.blackstone_shales": "Чернитовые сланцы", - - "biome.cinderscapes.ashy_shoals": "Пепельные косяки", - - "block.cinderscapes.scorched_shrub": "Выжженный куст", - "block.cinderscapes.scorched_sprouts": "Выжженные ростки", - "block.cinderscapes.scorched_tendrils": "Выжженные завитки", - "block.cinderscapes.pyracinth": "Пирацинт", - - "item.cinderscapes.ash_pile": "Кучка пепла", - "block.cinderscapes.ash": "Пепел", - "block.cinderscapes.ash_block": "Блок пепла", - - "block.cinderscapes.scorched_button": "Выжженная кнопка", - "block.cinderscapes.scorched_door": "Выжженная дверь", - "block.cinderscapes.scorched_fence": "Выжженный забор", - "block.cinderscapes.scorched_fence_gate": "Выжженная калитка", - "block.cinderscapes.scorched_hyphae": "Выжженные гифы", - "block.cinderscapes.scorched_planks": "Выжженные доски", - "block.cinderscapes.scorched_pressure_plate": "Выжженная нажимная плита", - "block.cinderscapes.scorched_sign": "Выжженная табличка", - "block.cinderscapes.scorched_hanging_sign": "Выжженная подвесная табличка", - "block.cinderscapes.scorched_slab": "Выжженная плита", - "block.cinderscapes.scorched_stairs": "Выжженные ступеньки", - "block.cinderscapes.scorched_stem": "Выжженный стебель", - "block.cinderscapes.scorched_trapdoor": "Выжженный люк", - "block.cinderscapes.stripped_scorched_hyphae": "Очищенные выжженные гифы", - "block.cinderscapes.stripped_scorched_stem": "Очищенный выжженный стебель", + "item.cinderscapes.sulfur_quartz": "Серный кварц", "item.cinderscapes.music_disc_chilling_in_hell": "Пластинка", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Пластинка", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Пепел", + "item.cinderscapes.ash_block": "Блок пепла", + "item.cinderscapes.chiseled_rose_quartz_block": "Резной блок розового кварца", + "item.cinderscapes.chiseled_smoky_quartz_block": "Резной блок дымчатого кварца", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Резной блок серного кварца", + "item.cinderscapes.crystalline_quartz": "Кристаллический кварц", + "item.cinderscapes.crystalline_rose_quartz": "Кристаллический розовый кварц", + "item.cinderscapes.crystalline_smoky_quartz": "Кристаллический дымчатый кварц", + "item.cinderscapes.crystalline_sulfur_quartz": "Кристаллический серный кварц", + "item.cinderscapes.crystinium": "Кристиниум", + "item.cinderscapes.ghastly_ectoplasm": "Призрачная эктоплазма", + "item.cinderscapes.luminous_pod": "Светящийся стручок", + "item.cinderscapes.photofern": "Фотопапоротник", + "item.cinderscapes.polypite_quartz": "Полипит кварца", + "item.cinderscapes.polypite_rose_quartz": "Полипит розового кварца", + "item.cinderscapes.polypite_smoky_quartz": "Полипит дымчатого кварца", + "item.cinderscapes.polypite_sulfur_quartz": "Полипит серного кварца", + "item.cinderscapes.pyracinth": "Пирацинт", + "item.cinderscapes.rose_quartz_block": "Блок розового кварца", + "item.cinderscapes.rose_quartz_bricks": "Кирпичи из розового кварца", + "item.cinderscapes.rose_quartz_ore": "Руда розового кварца", + "item.cinderscapes.rose_quartz_pillar": "Пилон из розового кварца", + "item.cinderscapes.rose_quartz_slab": "Плита из розового кварца", + "item.cinderscapes.rose_quartz_stairs": "Ступеньки из розового кварца", + "item.cinderscapes.scorched_button": "Выжженная кнопка", + "item.cinderscapes.scorched_door": "Выжженная дверь", + "item.cinderscapes.scorched_fence": "Выжженный забор", + "item.cinderscapes.scorched_fence_gate": "Выжженная калитка", + "item.cinderscapes.scorched_hanging_sign": "Выжженная подвесная табличка", + "item.cinderscapes.scorched_hyphae": "Выжженные гифы", + "item.cinderscapes.scorched_planks": "Выжженные доски", + "item.cinderscapes.scorched_pressure_plate": "Выжженная нажимная плита", + "item.cinderscapes.scorched_shrub": "Выжженный куст", + "item.cinderscapes.scorched_sign": "Выжженная табличка", + "item.cinderscapes.scorched_slab": "Выжженная плита", + "item.cinderscapes.scorched_sprouts": "Выжженные ростки", + "item.cinderscapes.scorched_stairs": "Выжженные ступеньки", + "item.cinderscapes.scorched_stem": "Выжженный стебель", + "item.cinderscapes.scorched_tendrils": "Выжженные завитки", + "item.cinderscapes.scorched_trapdoor": "Выжженный люк", + "item.cinderscapes.smoky_quartz_block": "Блок дымчатого кварца", + "item.cinderscapes.smoky_quartz_bricks": "Кирпичи из дымчатого кварца", + "item.cinderscapes.smoky_quartz_ore": "Руда дымчатого кварца", + "item.cinderscapes.smoky_quartz_pillar": "Пилон из дымчатого кварца", + "item.cinderscapes.smoky_quartz_slab": "Плита из дымчатого кварца", + "item.cinderscapes.smoky_quartz_stairs": "Ступеньки из дымчатого кварца", + "item.cinderscapes.smooth_rose_quartz": "Гладкий розовый кварц", + "item.cinderscapes.smooth_rose_quartz_slab": "Плита из гладкого розового кварца", + "item.cinderscapes.smooth_rose_quartz_stairs": "Ступеньки из гладкого розового кварца", + "item.cinderscapes.smooth_smoky_quartz": "Гладкий дымчатый кварц", + "item.cinderscapes.smooth_smoky_quartz_slab": "Плита из гладкого дымчатого кварца", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Ступеньки из гладкого дымчатого кварца", + "item.cinderscapes.smooth_sulfur_quartz": "Гладкий серный кварц", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Плита из гладкого серного кварца", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Ступеньки из гладкого серного кварца", + "item.cinderscapes.stripped_scorched_hyphae": "Очищенные выжженные гифы", + "item.cinderscapes.stripped_scorched_stem": "Очищенный выжженный стебель", + "item.cinderscapes.stripped_umbral_hyphae": "Очищенные мрачные гифы", + "item.cinderscapes.stripped_umbral_stem": "Очищенный мрачный стебель", + "item.cinderscapes.sulfur_block": "Блок серы", + "item.cinderscapes.sulfur_ore": "Серная руда", + "item.cinderscapes.sulfur_quartz_block": "Блок серного кварца", + "item.cinderscapes.sulfur_quartz_bricks": "Кирпичи из серного кварца", + "item.cinderscapes.sulfur_quartz_ore": "Руда серного кварца", + "item.cinderscapes.sulfur_quartz_pillar": "Пилон из серного кварца", + "item.cinderscapes.sulfur_quartz_slab": "Плита из серного кварца", + "item.cinderscapes.sulfur_quartz_stairs": "Ступеньки из серного кварца", + "item.cinderscapes.tall_photofern": "Высокий фотопапоротник", + "item.cinderscapes.twilight_fescues": "Сумеречные фески", + "item.cinderscapes.twilight_tendrils": "Сумеречные завитки", + "item.cinderscapes.twilight_vine_block": "Блок сумеречной лозы", + "item.cinderscapes.umbral_button": "Мрачная кнопка", + "item.cinderscapes.umbral_door": "Мрачная дверь", + "item.cinderscapes.umbral_fence": "Мрачный забор", + "item.cinderscapes.umbral_fence_gate": "Мрачная калитка", + "item.cinderscapes.umbral_flesh_block": "Блок мрачной плоти", + "item.cinderscapes.umbral_fungus": "Мрачный гриб", + "item.cinderscapes.umbral_hanging_sign": "Мрачная подвесная табличка", + "item.cinderscapes.umbral_hyphae": "Мрачные гифы", + "item.cinderscapes.umbral_nylium": "Мрачный нилий", + "item.cinderscapes.umbral_planks": "Мрачные доски", + "item.cinderscapes.umbral_pressure_plate": "Мрачная нажимная плита", + "item.cinderscapes.umbral_sign": "Мрачная табличка", + "item.cinderscapes.umbral_slab": "Мрачная плита", + "item.cinderscapes.umbral_stairs": "Мрачные ступеньки", + "item.cinderscapes.umbral_stem": "Мрачный стебель", + "item.cinderscapes.umbral_trapdoor": "Мрачный люк", + "item.cinderscapes.umbral_wart_block": "Блок мрачного нароста", + + "item.cinderscapes.nodzol": "Нодзол", + "item.cinderscapes.nodzol.description": "Этот блок проклят...", + "text.autoconfig.cinderscapes.title": "Конфигурация Cinderscapes", "text.autoconfig.cinderscapes.option.easterEggs": "Включить пасхалки", "text.autoconfig.cinderscapes.option.enableAshFall": "Включить падение пепла", @@ -137,8 +216,5 @@ "trim_material.cinderscapes.rose_quartz": "Розовый кварцевый материал", "trim_material.cinderscapes.smoky_quartz": "Дымчатый кварцевый материал", - "trim_material.cinderscapes.sulfur_quartz": "Серный кварцевый материал", - - "block.cinderscapes.nodzol": "Нодзол", - "block.cinderscapes.nodzol.description": "Этот блок проклят..." + "trim_material.cinderscapes.sulfur_quartz": "Серный кварцевый материал" } diff --git a/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json b/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json index cb00570f..a3ad5a88 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json +++ b/client/src/main/resources/assets/cinderscapes/lang/uk_ua.json @@ -1,26 +1,81 @@ { - "itemGroup.cinderscapes.items": "Cinderscapes", - - "block.cinderscapes.sulfur_ore": "Сірчана руда", - "block.cinderscapes.sulfur_block": "Сірчаний блок", - "item.cinderscapes.sulfur": "Сірка", - - "item.cinderscapes.bramble_berries": "Колючі ягоди", - "block.cinderscapes.bramble_berry_bush": "Кущ колючих ягід", - + "biome.cinderscapes.ashy_shoals": "Попільні насипи", + "biome.cinderscapes.blackstone_shales": "Чорнокам'яні сланці", "biome.cinderscapes.luminous_grove": "Люмінесцентний гай", + "biome.cinderscapes.quartz_cavern": "Кварцова печера", + "block.cinderscapes.ash": "Попіл", + "block.cinderscapes.ash_block": "Попільний блок", + "block.cinderscapes.bramble_berry_bush": "Кущ колючих ягід", + "block.cinderscapes.chiseled_rose_quartz_block": "Різьблений рожево-кварцовий блок", + "block.cinderscapes.chiseled_smoky_quartz_block": "Різьблений димчасто-кварцовий блок", + "block.cinderscapes.chiseled_sulfur_quartz_block": "Різьблений сірчано-кварцовий блок", + "block.cinderscapes.crystalline_quartz": "Кристалічний кварц", + "block.cinderscapes.crystalline_rose_quartz": "Кристалічний рожевий кварц", + "block.cinderscapes.crystalline_smoky_quartz": "Кристалічний димчастий кварц", + "block.cinderscapes.crystalline_sulfur_quartz": "Кристалічний сірчаний кварц", + "block.cinderscapes.crystinium": "Кристаній", + "block.cinderscapes.ghastly_ectoplasm": "Жахлива ектоплазма", "block.cinderscapes.luminous_pod": "Люмінесцентний стручок", - - "block.cinderscapes.twilight_tendrils": "Сутінкові вусики", - "block.cinderscapes.twilight_fescues": "Сутінкові фески", - "block.cinderscapes.twilight_vine_block": "Блок сутінкової лози", - "block.cinderscapes.photofern": "Світло-папороть", - "block.cinderscapes.tall_photofern": "Висока світло-папороть", - + "block.cinderscapes.polypite_quartz": "Кінчастий кварц", + "block.cinderscapes.polypite_rose_quartz": "Кінчастий рожевий кварц", + "block.cinderscapes.polypite_smoky_quartz": "Кінчастий димчастий кварц", + "block.cinderscapes.polypite_sulfur_quartz": "Кінчастий сірчаний кварц", + "block.cinderscapes.pyracinth": "Вогнецвіт", + "block.cinderscapes.rose_quartz_block": "Рожево-кварцовий блок", + "block.cinderscapes.rose_quartz_bricks": "Рожево-кварцова цегла", + "block.cinderscapes.rose_quartz_ore": "Рожево-кварцова руда", + "block.cinderscapes.rose_quartz_pillar": "Рожево-кварцова колона", + "block.cinderscapes.rose_quartz_slab": "Рожево-кварцова плита", + "block.cinderscapes.rose_quartz_stairs": "Рожево-кварцові сходи", + "block.cinderscapes.scorched_button": "Обпалена кнопка", + "block.cinderscapes.scorched_door": "Обпалені двері", + "block.cinderscapes.scorched_fence": "Обпалений паркан", + "block.cinderscapes.scorched_fence_gate": "Обпалена хвіртка", + "block.cinderscapes.scorched_hanging_sign": "Обпалена вивіска", + "block.cinderscapes.scorched_hyphae": "Обпалені гіфи", + "block.cinderscapes.scorched_planks": "Обпалені дошки", + "block.cinderscapes.scorched_pressure_plate": "Обпалена натискна плита", + "block.cinderscapes.scorched_shrub": "Обпалений кущ", + "block.cinderscapes.scorched_sign": "Обпалена табличка", + "block.cinderscapes.scorched_slab": "Обпалена плита", + "block.cinderscapes.scorched_sprouts": "Обпалені паростки", + "block.cinderscapes.scorched_stairs": "Обпалені сходи", + "block.cinderscapes.scorched_stem": "Обпалене стебло", + "block.cinderscapes.scorched_tendrils": "Обпалені вусики", + "block.cinderscapes.scorched_trapdoor": "Обпалений люк", + "block.cinderscapes.smoky_quartz_block": "Димчасто-кварцовий блок", + "block.cinderscapes.smoky_quartz_bricks": "Димчасто-кварцова цегла", + "block.cinderscapes.smoky_quartz_ore": "Димчасто-кварцова руда", + "block.cinderscapes.smoky_quartz_pillar": "Димчасто-кварцова колона", + "block.cinderscapes.smoky_quartz_slab": "Димчасто-кварцова плита", + "block.cinderscapes.smoky_quartz_stairs": "Димчасто-кварцові сходи", + "block.cinderscapes.smooth_rose_quartz": "Гладкий рожево-кварцовий блок", + "block.cinderscapes.smooth_rose_quartz_slab": "Гладка рожево-кварцова плита", + "block.cinderscapes.smooth_rose_quartz_stairs": "Гладкі рожево-кварцові сходи", + "block.cinderscapes.smooth_smoky_quartz": "Гладкий димчасто-кварцовий блок", + "block.cinderscapes.smooth_smoky_quartz_slab": "Гладка димчасто-кварцова плита", + "block.cinderscapes.smooth_smoky_quartz_stairs": "Гладкі димчасто-кварцові сходи", + "block.cinderscapes.smooth_sulfur_quartz": "Гладкий сірчано-кварцовий блок", + "block.cinderscapes.smooth_sulfur_quartz_slab": "Гладка сірчано-кварцова плита", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "Гладкі сірчано-кварцові сходи", + "block.cinderscapes.stripped_scorched_hyphae": "Обтесані обпалені гіфи", + "block.cinderscapes.stripped_scorched_stem": "Обтесане обпалене стебло", "block.cinderscapes.stripped_umbral_hyphae": "Обтесані тіньові гіфи", "block.cinderscapes.stripped_umbral_stem": "Обтесане тіньове стебло", + "block.cinderscapes.sulfur_block": "Сірчаний блок", + "block.cinderscapes.sulfur_ore": "Сірчана руда", + "block.cinderscapes.sulfur_quartz_block": "Сірчано-кварцовий блок", + "block.cinderscapes.sulfur_quartz_bricks": "Сірчано-кварцова цегла", + "block.cinderscapes.sulfur_quartz_ore": "Сірчано-кварцова руда", + "block.cinderscapes.sulfur_quartz_pillar": "Сірчано-кварцова колона", + "block.cinderscapes.sulfur_quartz_slab": "Сірчано-кварцова плита", + "block.cinderscapes.sulfur_quartz_stairs": "Сірчано-кварцові сходи", + "block.cinderscapes.tall_photofern": "Висока світло-папороть", + "block.cinderscapes.twilight_fescues": "Сутінкові фески", + "block.cinderscapes.twilight_tendrils": "Сутінкові вусики", + "block.cinderscapes.twilight_vine_block": "Блок сутінкової лози", "block.cinderscapes.umbral_button": "Тіньова кнопка", "block.cinderscapes.umbral_door": "Тіньові двері", "block.cinderscapes.umbral_fence": "Тіньовий паркан", @@ -39,91 +94,115 @@ "block.cinderscapes.umbral_trapdoor": "Тіньовий люк", "block.cinderscapes.umbral_wart_block": "Блок тіньового наросту", - "block.cinderscapes.ghastly_ectoplasm": "Жахлива ектоплазма", - - "biome.cinderscapes.quartz_cavern": "Кварцова печера", - - "block.cinderscapes.crystinium": "Кристаній", - - "block.cinderscapes.polypite_quartz": "Кінчастий кварц", - "block.cinderscapes.crystalline_quartz": "Кристалічний кварц", + "block.cinderscapes.nodzol": "Нідзол", + "block.cinderscapes.nodzol.description": "Цей блок доглянуто...", - "block.cinderscapes.chiseled_sulfur_quartz_block": "Різьблений сірчано-кварцовий блок", - "block.cinderscapes.crystalline_sulfur_quartz": "Кристалічний сірчаний кварц", - "block.cinderscapes.polypite_sulfur_quartz": "Кінчастий сірчаний кварц", - "block.cinderscapes.smooth_sulfur_quartz": "Гладкий сірчано-кварцовий блок", - "block.cinderscapes.smooth_sulfur_quartz_slab": "Гладка сірчано-кварцова плита", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "Гладкі сірчано-кварцові сходи", - "block.cinderscapes.sulfur_quartz_block": "Сірчано-кварцовий блок", - "block.cinderscapes.sulfur_quartz_bricks": "Сірчано-кварцова цегла", - "block.cinderscapes.sulfur_quartz_ore": "Сірчано-кварцова руда", - "block.cinderscapes.sulfur_quartz_pillar": "Сірчано-кварцова колона", - "block.cinderscapes.sulfur_quartz_slab": "Сірчано-кварцова плита", - "block.cinderscapes.sulfur_quartz_stairs": "Сірчано-кварцові сходи", - "item.cinderscapes.sulfur_quartz": "Сірчаний кварц", + "itemGroup.cinderscapes.items": "Cinderscapes", + "item.cinderscapes.ash_pile": "Купа попелу", + "item.cinderscapes.bramble_berries": "Колючі ягоди", + "item.cinderscapes.sulfur": "Сірка", - "block.cinderscapes.chiseled_rose_quartz_block": "Різьблений рожево-кварцовий блок", - "block.cinderscapes.crystalline_rose_quartz": "Кристалічний рожевий кварц", - "block.cinderscapes.polypite_rose_quartz": "Кінчастий рожевий кварц", - "block.cinderscapes.rose_quartz_block": "Рожево-кварцовий блок", - "block.cinderscapes.rose_quartz_bricks": "Рожево-кварцова цегла", - "block.cinderscapes.rose_quartz_ore": "Рожево-кварцова руда", - "block.cinderscapes.rose_quartz_pillar": "Рожево-кварцова колона", - "block.cinderscapes.rose_quartz_slab": "Рожево-кварцова плита", - "block.cinderscapes.rose_quartz_stairs": "Рожево-кварцові сходи", - "block.cinderscapes.smooth_rose_quartz": "Гладкий рожево-кварцовий блок", - "block.cinderscapes.smooth_rose_quartz_slab": "Гладка рожево-кварцова плита", - "block.cinderscapes.smooth_rose_quartz_stairs": "Гладкі рожево-кварцові сходи", "item.cinderscapes.rose_quartz": "Рожевий кварц", - - "block.cinderscapes.chiseled_smoky_quartz_block": "Різьблений димчасто-кварцовий блок", - "block.cinderscapes.crystalline_smoky_quartz": "Кристалічний димчастий кварц", - "block.cinderscapes.polypite_smoky_quartz": "Кінчастий димчастий кварц", - "block.cinderscapes.smoky_quartz_block": "Димчасто-кварцовий блок", - "block.cinderscapes.smoky_quartz_bricks": "Димчасто-кварцова цегла", - "block.cinderscapes.smoky_quartz_ore": "Димчасто-кварцова руда", - "block.cinderscapes.smoky_quartz_pillar": "Димчасто-кварцова колона", - "block.cinderscapes.smoky_quartz_slab": "Димчасто-кварцова плита", - "block.cinderscapes.smoky_quartz_stairs": "Димчасто-кварцові сходи", - "block.cinderscapes.smooth_smoky_quartz": "Гладкий димчасто-кварцовий блок", - "block.cinderscapes.smooth_smoky_quartz_slab": "Гладка димчасто-кварцова плита", - "block.cinderscapes.smooth_smoky_quartz_stairs": "Гладкі димчасто-кварцові сходи", "item.cinderscapes.smoky_quartz": "Димчастий кварц", - - "biome.cinderscapes.blackstone_shales": "Чорнокам'яні сланці", - - "biome.cinderscapes.ashy_shoals": "Попільні насипи", - - "block.cinderscapes.scorched_shrub": "Обпалений кущ", - "block.cinderscapes.scorched_sprouts": "Обпалені паростки", - "block.cinderscapes.scorched_tendrils": "Обпалені вусики", - "block.cinderscapes.pyracinth": "Вогнецвіт", - - "item.cinderscapes.ash_pile": "Купа попелу", - "block.cinderscapes.ash": "Попіл", - "block.cinderscapes.ash_block": "Попільний блок", - - "block.cinderscapes.scorched_button": "Обпалена кнопка", - "block.cinderscapes.scorched_door": "Обпалені двері", - "block.cinderscapes.scorched_fence": "Обпалений паркан", - "block.cinderscapes.scorched_fence_gate": "Обпалена хвіртка", - "block.cinderscapes.scorched_hanging_sign": "Обпалена вивіска", - "block.cinderscapes.scorched_hyphae": "Обпалені гіфи", - "block.cinderscapes.scorched_planks": "Обпалені дошки", - "block.cinderscapes.scorched_pressure_plate": "Обпалена натискна плита", - "block.cinderscapes.scorched_sign": "Обпалена табличка", - "block.cinderscapes.scorched_slab": "Обпалена плита", - "block.cinderscapes.scorched_stairs": "Обпалені сходи", - "block.cinderscapes.scorched_stem": "Обпалене стебло", - "block.cinderscapes.scorched_trapdoor": "Обпалений люк", - "block.cinderscapes.stripped_scorched_hyphae": "Обтесані обпалені гіфи", - "block.cinderscapes.stripped_scorched_stem": "Обтесане обпалене стебло", + "item.cinderscapes.sulfur_quartz": "Сірчаний кварц", "item.cinderscapes.music_disc_chilling_in_hell": "Платівка", "item.cinderscapes.music_disc_chilling_in_hell.desc": "Etorna_Z - Chilling In Hell", "item.cinderscapes.music_disc_luminous_plantation": "Платівка", "item.cinderscapes.music_disc_luminous_plantation.desc": "LudoCrypt - Luminous Plantation", + "item.cinderscapes.ash": "Попіл", + "item.cinderscapes.ash_block": "Попільний блок", + "item.cinderscapes.chiseled_rose_quartz_block": "Різьблений рожево-кварцовий блок", + "item.cinderscapes.chiseled_smoky_quartz_block": "Різьблений димчасто-кварцовий блок", + "item.cinderscapes.chiseled_sulfur_quartz_block": "Різьблений сірчано-кварцовий блок", + "item.cinderscapes.crystalline_quartz": "Кристалічний кварц", + "item.cinderscapes.crystalline_rose_quartz": "Кристалічний рожевий кварц", + "item.cinderscapes.crystalline_smoky_quartz": "Кристалічний димчастий кварц", + "item.cinderscapes.crystalline_sulfur_quartz": "Кристалічний сірчаний кварц", + "item.cinderscapes.crystinium": "Кристаній", + "item.cinderscapes.ghastly_ectoplasm": "Жахлива ектоплазма", + "item.cinderscapes.luminous_pod": "Люмінесцентний стручок", + "item.cinderscapes.photofern": "Світло-папороть", + "item.cinderscapes.polypite_quartz": "Кінчастий кварц", + "item.cinderscapes.polypite_rose_quartz": "Кінчастий рожевий кварц", + "item.cinderscapes.polypite_smoky_quartz": "Кінчастий димчастий кварц", + "item.cinderscapes.polypite_sulfur_quartz": "Кінчастий сірчаний кварц", + "item.cinderscapes.pyracinth": "Вогнецвіт", + "item.cinderscapes.rose_quartz_block": "Рожево-кварцовий блок", + "item.cinderscapes.rose_quartz_bricks": "Рожево-кварцова цегла", + "item.cinderscapes.rose_quartz_ore": "Рожево-кварцова руда", + "item.cinderscapes.rose_quartz_pillar": "Рожево-кварцова колона", + "item.cinderscapes.rose_quartz_slab": "Рожево-кварцова плита", + "item.cinderscapes.rose_quartz_stairs": "Рожево-кварцові сходи", + "item.cinderscapes.scorched_button": "Обпалена кнопка", + "item.cinderscapes.scorched_door": "Обпалені двері", + "item.cinderscapes.scorched_fence": "Обпалений паркан", + "item.cinderscapes.scorched_fence_gate": "Обпалена хвіртка", + "item.cinderscapes.scorched_hanging_sign": "Обпалена вивіска", + "item.cinderscapes.scorched_hyphae": "Обпалені гіфи", + "item.cinderscapes.scorched_planks": "Обпалені дошки", + "item.cinderscapes.scorched_pressure_plate": "Обпалена натискна плита", + "item.cinderscapes.scorched_shrub": "Обпалений кущ", + "item.cinderscapes.scorched_sign": "Обпалена табличка", + "item.cinderscapes.scorched_slab": "Обпалена плита", + "item.cinderscapes.scorched_sprouts": "Обпалені паростки", + "item.cinderscapes.scorched_stairs": "Обпалені сходи", + "item.cinderscapes.scorched_stem": "Обпалене стебло", + "item.cinderscapes.scorched_tendrils": "Обпалені вусики", + "item.cinderscapes.scorched_trapdoor": "Обпалений люк", + "item.cinderscapes.smoky_quartz_block": "Димчасто-кварцовий блок", + "item.cinderscapes.smoky_quartz_bricks": "Димчасто-кварцова цегла", + "item.cinderscapes.smoky_quartz_ore": "Димчасто-кварцова руда", + "item.cinderscapes.smoky_quartz_pillar": "Димчасто-кварцова колона", + "item.cinderscapes.smoky_quartz_slab": "Димчасто-кварцова плита", + "item.cinderscapes.smoky_quartz_stairs": "Димчасто-кварцові сходи", + "item.cinderscapes.smooth_rose_quartz": "Гладкий рожево-кварцовий блок", + "item.cinderscapes.smooth_rose_quartz_slab": "Гладка рожево-кварцова плита", + "item.cinderscapes.smooth_rose_quartz_stairs": "Гладкі рожево-кварцові сходи", + "item.cinderscapes.smooth_smoky_quartz": "Гладкий димчасто-кварцовий блок", + "item.cinderscapes.smooth_smoky_quartz_slab": "Гладка димчасто-кварцова плита", + "item.cinderscapes.smooth_smoky_quartz_stairs": "Гладкі димчасто-кварцові сходи", + "item.cinderscapes.smooth_sulfur_quartz": "Гладкий сірчано-кварцовий блок", + "item.cinderscapes.smooth_sulfur_quartz_slab": "Гладка сірчано-кварцова плита", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "Гладкі сірчано-кварцові сходи", + "item.cinderscapes.stripped_scorched_hyphae": "Обтесані обпалені гіфи", + "item.cinderscapes.stripped_scorched_stem": "Обтесане обпалене стебло", + "item.cinderscapes.stripped_umbral_hyphae": "Обтесані тіньові гіфи", + "item.cinderscapes.stripped_umbral_stem": "Обтесане тіньове стебло", + "item.cinderscapes.sulfur_block": "Сірчаний блок", + "item.cinderscapes.sulfur_ore": "Сірчана руда", + "item.cinderscapes.sulfur_quartz_block": "Сірчано-кварцовий блок", + "item.cinderscapes.sulfur_quartz_bricks": "Сірчано-кварцова цегла", + "item.cinderscapes.sulfur_quartz_ore": "Сірчано-кварцова руда", + "item.cinderscapes.sulfur_quartz_pillar": "Сірчано-кварцова колона", + "item.cinderscapes.sulfur_quartz_slab": "Сірчано-кварцова плита", + "item.cinderscapes.sulfur_quartz_stairs": "Сірчано-кварцові сходи", + "item.cinderscapes.tall_photofern": "Висока світло-папороть", + "item.cinderscapes.twilight_fescues": "Сутінкові фески", + "item.cinderscapes.twilight_tendrils": "Сутінкові вусики", + "item.cinderscapes.twilight_vine_block": "Блок сутінкової лози", + "item.cinderscapes.umbral_button": "Тіньова кнопка", + "item.cinderscapes.umbral_door": "Тіньові двері", + "item.cinderscapes.umbral_fence": "Тіньовий паркан", + "item.cinderscapes.umbral_fence_gate": "Тіньова хвіртка", + "item.cinderscapes.umbral_flesh_block": "Блок тіньової плоті", + "item.cinderscapes.umbral_fungus": "Тіньовий гриб", + "item.cinderscapes.umbral_hanging_sign": "Тіньова вивіска", + "item.cinderscapes.umbral_hyphae": "Тіньові гіфи", + "item.cinderscapes.umbral_nylium": "Тіньовий нілій", + "item.cinderscapes.umbral_planks": "Тіньові дошки", + "item.cinderscapes.umbral_pressure_plate": "Тіньова натискна плита", + "item.cinderscapes.umbral_sign": "Тіньова табличка", + "item.cinderscapes.umbral_slab": "Тіньова плита", + "item.cinderscapes.umbral_stairs": "Тіньові сходи", + "item.cinderscapes.umbral_stem": "Тіньове стебло", + "item.cinderscapes.umbral_trapdoor": "Тіньовий люк", + "item.cinderscapes.umbral_wart_block": "Блок тіньового наросту", + + "item.cinderscapes.nodzol": "Нідзол", + "item.cinderscapes.nodzol.description": "Цей блок доглянуто...", + "text.autoconfig.cinderscapes.title": "Конфігурація Cinderscapes", "text.autoconfig.cinderscapes.option.easterEggs": "Увімкнути яйця-райця", "text.autoconfig.cinderscapes.option.enableAshFall": "Увімкнути падіння попелу", @@ -137,8 +216,5 @@ "trim_material.cinderscapes.rose_quartz": "Рожево-кварцовий матеріал", "trim_material.cinderscapes.smoky_quartz": "Димчасто-кварцовий матеріал", - "trim_material.cinderscapes.sulfur_quartz": "Сірчано-кварцовий матеріал", - - "block.cinderscapes.nodzol": "Нідзол", - "block.cinderscapes.nodzol.description": "Цей блок доглянуто..." + "trim_material.cinderscapes.sulfur_quartz": "Сірчано-кварцовий матеріал" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json b/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json index f9ec05c5..26ca4409 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json +++ b/client/src/main/resources/assets/cinderscapes/lang/zh_cn.json @@ -1,26 +1,81 @@ { - "itemGroup.cinderscapes.items": "余烬奇景", - - "block.cinderscapes.sulfur_ore": "硫矿石", - "block.cinderscapes.sulfur_block": "硫块", - "item.cinderscapes.sulfur": "硫", - - "item.cinderscapes.bramble_berries": "树莓", - "block.cinderscapes.bramble_berry_bush": "树莓丛", - + "biome.cinderscapes.ashy_shoals": "灰烬浅滩", + "biome.cinderscapes.blackstone_shales": "黑石页岩", "biome.cinderscapes.luminous_grove": "夜光树林", + "biome.cinderscapes.quartz_cavern": "石英峡谷", + "block.cinderscapes.ash": "灰烬", + "block.cinderscapes.ash_block": "灰烬块", + "block.cinderscapes.bramble_berry_bush": "树莓丛", + "block.cinderscapes.chiseled_rose_quartz_block": "錾制玫瑰色石英块", + "block.cinderscapes.chiseled_smoky_quartz_block": "錾制熏制石英块", + "block.cinderscapes.chiseled_sulfur_quartz_block": "錾制硫石英块", + "block.cinderscapes.crystalline_quartz": "结晶石英", + "block.cinderscapes.crystalline_rose_quartz": "结晶玫瑰色石英", + "block.cinderscapes.crystalline_smoky_quartz": "结晶熏制石英", + "block.cinderscapes.crystalline_sulfur_quartz": "结晶硫石英", + "block.cinderscapes.crystinium": "晶体", + "block.cinderscapes.ghastly_ectoplasm": "恐怖灵质", "block.cinderscapes.luminous_pod": "发光豆荚", - - "block.cinderscapes.twilight_tendrils": "暮色卷须", - "block.cinderscapes.twilight_fescues": "暮色羊茅", - "block.cinderscapes.twilight_vine_block": "暮色藤蔓块", - "block.cinderscapes.photofern": "光蕨", - "block.cinderscapes.tall_photofern": "高光蕨", - + "block.cinderscapes.polypite_quartz": "聚合石英", + "block.cinderscapes.polypite_rose_quartz": "聚合玫瑰色石英", + "block.cinderscapes.polypite_smoky_quartz": "聚合熏制石英", + "block.cinderscapes.polypite_sulfur_quartz": "聚合硫石英", + "block.cinderscapes.pyracinth": "风信子", + "block.cinderscapes.rose_quartz_block": "玫瑰色石英块", + "block.cinderscapes.rose_quartz_bricks": "玫瑰色石英砖", + "block.cinderscapes.rose_quartz_ore": "玫瑰色石英矿石", + "block.cinderscapes.rose_quartz_pillar": "玫瑰色石英柱", + "block.cinderscapes.rose_quartz_slab": "玫瑰色石英台阶", + "block.cinderscapes.rose_quartz_stairs": "玫瑰色石英楼梯", + "block.cinderscapes.scorched_button": "烧焦的按钮", + "block.cinderscapes.scorched_door": "烧焦的门", + "block.cinderscapes.scorched_fence": "烧焦的栅栏", + "block.cinderscapes.scorched_fence_gate": "烧焦的栅栏门", + "block.cinderscapes.scorched_hanging_sign" : "悬挂式烧焦的告示牌", + "block.cinderscapes.scorched_hyphae": "烧焦的菌丝", + "block.cinderscapes.scorched_planks": "烧焦的木板", + "block.cinderscapes.scorched_pressure_plate": "烧焦的压力板", + "block.cinderscapes.scorched_shrub": "烧焦的灌木", + "block.cinderscapes.scorched_sign": "烧焦的告示牌", + "block.cinderscapes.scorched_slab": "烧焦的台阶", + "block.cinderscapes.scorched_sprouts": "烧焦的幼苗", + "block.cinderscapes.scorched_stairs": "烧焦的楼梯", + "block.cinderscapes.scorched_stem": "烧焦的树干", + "block.cinderscapes.scorched_tendrils": "烧焦的卷须", + "block.cinderscapes.scorched_trapdoor": "烧焦的活板门", + "block.cinderscapes.smoky_quartz_block": "熏制石英块", + "block.cinderscapes.smoky_quartz_bricks": "熏制石英砖", + "block.cinderscapes.smoky_quartz_ore": "熏制石英矿石", + "block.cinderscapes.smoky_quartz_pillar": "熏制石英柱", + "block.cinderscapes.smoky_quartz_slab": "熏制石英台阶", + "block.cinderscapes.smoky_quartz_stairs": "熏制石英楼梯", + "block.cinderscapes.smooth_rose_quartz": "平滑玫瑰色石英", + "block.cinderscapes.smooth_rose_quartz_slab": "平滑玫瑰色石英台阶", + "block.cinderscapes.smooth_rose_quartz_stairs": "平滑玫瑰色石英楼梯", + "block.cinderscapes.smooth_smoky_quartz": "平滑熏制石英", + "block.cinderscapes.smooth_smoky_quartz_slab": "平滑熏制石英台阶", + "block.cinderscapes.smooth_smoky_quartz_stairs": "平滑熏制石英楼梯", + "block.cinderscapes.smooth_sulfur_quartz": "平滑硫石英", + "block.cinderscapes.smooth_sulfur_quartz_slab": "平滑硫石英台阶", + "block.cinderscapes.smooth_sulfur_quartz_stairs": "平滑硫石英楼梯", + "block.cinderscapes.stripped_scorched_hyphae": "烧焦的去皮菌丝", + "block.cinderscapes.stripped_scorched_stem": "烧焦的去皮树干", "block.cinderscapes.stripped_umbral_hyphae": "去皮暗影菌丝", "block.cinderscapes.stripped_umbral_stem": "去皮暗影树干", + "block.cinderscapes.sulfur_block": "硫块", + "block.cinderscapes.sulfur_ore": "硫矿石", + "block.cinderscapes.sulfur_quartz_block": "硫石英块", + "block.cinderscapes.sulfur_quartz_bricks": "硫石英砖", + "block.cinderscapes.sulfur_quartz_ore": "硫石英矿石", + "block.cinderscapes.sulfur_quartz_pillar": "硫石英柱", + "block.cinderscapes.sulfur_quartz_slab": "硫石英台阶", + "block.cinderscapes.sulfur_quartz_stairs": "硫石英楼梯", + "block.cinderscapes.tall_photofern": "高光蕨", + "block.cinderscapes.twilight_fescues": "暮色羊茅", + "block.cinderscapes.twilight_tendrils": "暮色卷须", + "block.cinderscapes.twilight_vine_block": "暮色藤蔓块", "block.cinderscapes.umbral_button": "暗影按钮", "block.cinderscapes.umbral_door": "暗影门", "block.cinderscapes.umbral_fence": "暗影栅栏", @@ -39,83 +94,101 @@ "block.cinderscapes.umbral_trapdoor": "暗影活板门", "block.cinderscapes.umbral_wart_block": "暗影疣块", - "block.cinderscapes.ghastly_ectoplasm": "恐怖灵质", - - "biome.cinderscapes.quartz_cavern": "石英峡谷", - - "block.cinderscapes.crystinium": "晶体", - - "block.cinderscapes.polypite_quartz": "聚合石英", - "block.cinderscapes.crystalline_quartz": "结晶石英", + "itemGroup.cinderscapes.items": "余烬奇景", + "item.cinderscapes.ash_pile": "灰烬堆", + "item.cinderscapes.bramble_berries": "树莓", + "item.cinderscapes.sulfur": "硫", - "block.cinderscapes.chiseled_sulfur_quartz_block": "錾制硫石英块", - "block.cinderscapes.crystalline_sulfur_quartz": "结晶硫石英", - "block.cinderscapes.polypite_sulfur_quartz": "聚合硫石英", - "block.cinderscapes.smooth_sulfur_quartz": "平滑硫石英", - "block.cinderscapes.smooth_sulfur_quartz_slab": "平滑硫石英台阶", - "block.cinderscapes.smooth_sulfur_quartz_stairs": "平滑硫石英楼梯", - "block.cinderscapes.sulfur_quartz_block": "硫石英块", - "block.cinderscapes.sulfur_quartz_bricks": "硫石英砖", - "block.cinderscapes.sulfur_quartz_ore": "硫石英矿石", - "block.cinderscapes.sulfur_quartz_pillar": "硫石英柱", - "block.cinderscapes.sulfur_quartz_slab": "硫石英台阶", - "block.cinderscapes.sulfur_quartz_stairs": "硫石英楼梯", "item.cinderscapes.sulfur_quartz": "硫石英", - - "block.cinderscapes.chiseled_rose_quartz_block": "錾制玫瑰色石英块", - "block.cinderscapes.crystalline_rose_quartz": "结晶玫瑰色石英", - "block.cinderscapes.polypite_rose_quartz": "聚合玫瑰色石英", - "block.cinderscapes.rose_quartz_block": "玫瑰色石英块", - "block.cinderscapes.rose_quartz_bricks": "玫瑰色石英砖", - "block.cinderscapes.rose_quartz_ore": "玫瑰色石英矿石", - "block.cinderscapes.rose_quartz_pillar": "玫瑰色石英柱", - "block.cinderscapes.rose_quartz_slab": "玫瑰色石英台阶", - "block.cinderscapes.rose_quartz_stairs": "玫瑰色石英楼梯", - "block.cinderscapes.smooth_rose_quartz": "平滑玫瑰色石英", - "block.cinderscapes.smooth_rose_quartz_slab": "平滑玫瑰色石英台阶", - "block.cinderscapes.smooth_rose_quartz_stairs": "平滑玫瑰色石英楼梯", "item.cinderscapes.rose_quartz": "玫瑰色石英", - - "block.cinderscapes.chiseled_smoky_quartz_block": "錾制熏制石英块", - "block.cinderscapes.crystalline_smoky_quartz": "结晶熏制石英", - "block.cinderscapes.polypite_smoky_quartz": "聚合熏制石英", - "block.cinderscapes.smoky_quartz_block": "熏制石英块", - "block.cinderscapes.smoky_quartz_bricks": "熏制石英砖", - "block.cinderscapes.smoky_quartz_ore": "熏制石英矿石", - "block.cinderscapes.smoky_quartz_pillar": "熏制石英柱", - "block.cinderscapes.smoky_quartz_slab": "熏制石英台阶", - "block.cinderscapes.smoky_quartz_stairs": "熏制石英楼梯", - "block.cinderscapes.smooth_smoky_quartz": "平滑熏制石英", - "block.cinderscapes.smooth_smoky_quartz_slab": "平滑熏制石英台阶", - "block.cinderscapes.smooth_smoky_quartz_stairs": "平滑熏制石英楼梯", "item.cinderscapes.smoky_quartz": "熏制石英", - "biome.cinderscapes.blackstone_shales": "黑石页岩", - - "biome.cinderscapes.ashy_shoals": "灰烬浅滩", - - "block.cinderscapes.scorched_shrub": "烧焦的灌木", - "block.cinderscapes.scorched_sprouts": "烧焦的幼苗", - "block.cinderscapes.scorched_tendrils": "烧焦的卷须", - "block.cinderscapes.pyracinth": "风信子", - - "item.cinderscapes.ash_pile": "灰烬堆", - "block.cinderscapes.ash": "灰烬", - "block.cinderscapes.ash_block": "灰烬块", - - "block.cinderscapes.scorched_button": "烧焦的按钮", - "block.cinderscapes.scorched_door": "烧焦的门", - "block.cinderscapes.scorched_fence": "烧焦的栅栏", - "block.cinderscapes.scorched_fence_gate": "烧焦的栅栏门", - "block.cinderscapes.scorched_hanging_sign" : "悬挂式烧焦的告示牌", - "block.cinderscapes.scorched_hyphae": "烧焦的菌丝", - "block.cinderscapes.scorched_planks": "烧焦的木板", - "block.cinderscapes.scorched_pressure_plate": "烧焦的压力板", - "block.cinderscapes.scorched_sign": "烧焦的告示牌", - "block.cinderscapes.scorched_slab": "烧焦的台阶", - "block.cinderscapes.scorched_stairs": "烧焦的楼梯", - "block.cinderscapes.scorched_stem": "烧焦的树干", - "block.cinderscapes.scorched_trapdoor": "烧焦的活板门", - "block.cinderscapes.stripped_scorched_hyphae": "烧焦的去皮菌丝", - "block.cinderscapes.stripped_scorched_stem": "烧焦的去皮树干" + "item.cinderscapes.ash": "灰烬", + "item.cinderscapes.ash_block": "灰烬块", + "item.cinderscapes.chiseled_rose_quartz_block": "錾制玫瑰色石英块", + "item.cinderscapes.chiseled_smoky_quartz_block": "錾制熏制石英块", + "item.cinderscapes.chiseled_sulfur_quartz_block": "錾制硫石英块", + "item.cinderscapes.crystalline_quartz": "结晶石英", + "item.cinderscapes.crystalline_rose_quartz": "结晶玫瑰色石英", + "item.cinderscapes.crystalline_smoky_quartz": "结晶熏制石英", + "item.cinderscapes.crystalline_sulfur_quartz": "结晶硫石英", + "item.cinderscapes.crystinium": "晶体", + "item.cinderscapes.ghastly_ectoplasm": "恐怖灵质", + "item.cinderscapes.luminous_pod": "发光豆荚", + "item.cinderscapes.photofern": "光蕨", + "item.cinderscapes.polypite_quartz": "聚合石英", + "item.cinderscapes.polypite_rose_quartz": "聚合玫瑰色石英", + "item.cinderscapes.polypite_smoky_quartz": "聚合熏制石英", + "item.cinderscapes.polypite_sulfur_quartz": "聚合硫石英", + "item.cinderscapes.pyracinth": "风信子", + "item.cinderscapes.rose_quartz_block": "玫瑰色石英块", + "item.cinderscapes.rose_quartz_bricks": "玫瑰色石英砖", + "item.cinderscapes.rose_quartz_ore": "玫瑰色石英矿石", + "item.cinderscapes.rose_quartz_pillar": "玫瑰色石英柱", + "item.cinderscapes.rose_quartz_slab": "玫瑰色石英台阶", + "item.cinderscapes.rose_quartz_stairs": "玫瑰色石英楼梯", + "item.cinderscapes.scorched_button": "烧焦的按钮", + "item.cinderscapes.scorched_door": "烧焦的门", + "item.cinderscapes.scorched_fence": "烧焦的栅栏", + "item.cinderscapes.scorched_fence_gate": "烧焦的栅栏门", + "item.cinderscapes.scorched_hanging_sign" : "悬挂式烧焦的告示牌", + "item.cinderscapes.scorched_hyphae": "烧焦的菌丝", + "item.cinderscapes.scorched_planks": "烧焦的木板", + "item.cinderscapes.scorched_pressure_plate": "烧焦的压力板", + "item.cinderscapes.scorched_shrub": "烧焦的灌木", + "item.cinderscapes.scorched_sign": "烧焦的告示牌", + "item.cinderscapes.scorched_slab": "烧焦的台阶", + "item.cinderscapes.scorched_sprouts": "烧焦的幼苗", + "item.cinderscapes.scorched_stairs": "烧焦的楼梯", + "item.cinderscapes.scorched_stem": "烧焦的树干", + "item.cinderscapes.scorched_tendrils": "烧焦的卷须", + "item.cinderscapes.scorched_trapdoor": "烧焦的活板门", + "item.cinderscapes.smoky_quartz_block": "熏制石英块", + "item.cinderscapes.smoky_quartz_bricks": "熏制石英砖", + "item.cinderscapes.smoky_quartz_ore": "熏制石英矿石", + "item.cinderscapes.smoky_quartz_pillar": "熏制石英柱", + "item.cinderscapes.smoky_quartz_slab": "熏制石英台阶", + "item.cinderscapes.smoky_quartz_stairs": "熏制石英楼梯", + "item.cinderscapes.smooth_rose_quartz": "平滑玫瑰色石英", + "item.cinderscapes.smooth_rose_quartz_slab": "平滑玫瑰色石英台阶", + "item.cinderscapes.smooth_rose_quartz_stairs": "平滑玫瑰色石英楼梯", + "item.cinderscapes.smooth_smoky_quartz": "平滑熏制石英", + "item.cinderscapes.smooth_smoky_quartz_slab": "平滑熏制石英台阶", + "item.cinderscapes.smooth_smoky_quartz_stairs": "平滑熏制石英楼梯", + "item.cinderscapes.smooth_sulfur_quartz": "平滑硫石英", + "item.cinderscapes.smooth_sulfur_quartz_slab": "平滑硫石英台阶", + "item.cinderscapes.smooth_sulfur_quartz_stairs": "平滑硫石英楼梯", + "item.cinderscapes.stripped_scorched_hyphae": "烧焦的去皮菌丝", + "item.cinderscapes.stripped_scorched_stem": "烧焦的去皮树干", + "item.cinderscapes.stripped_umbral_hyphae": "去皮暗影菌丝", + "item.cinderscapes.stripped_umbral_stem": "去皮暗影树干", + "item.cinderscapes.sulfur_block": "硫块", + "item.cinderscapes.sulfur_ore": "硫矿石", + "item.cinderscapes.sulfur_quartz_block": "硫石英块", + "item.cinderscapes.sulfur_quartz_bricks": "硫石英砖", + "item.cinderscapes.sulfur_quartz_ore": "硫石英矿石", + "item.cinderscapes.sulfur_quartz_pillar": "硫石英柱", + "item.cinderscapes.sulfur_quartz_slab": "硫石英台阶", + "item.cinderscapes.sulfur_quartz_stairs": "硫石英楼梯", + "item.cinderscapes.tall_photofern": "高光蕨", + "item.cinderscapes.twilight_fescues": "暮色羊茅", + "item.cinderscapes.twilight_tendrils": "暮色卷须", + "item.cinderscapes.twilight_vine_block": "暮色藤蔓块", + "item.cinderscapes.umbral_button": "暗影按钮", + "item.cinderscapes.umbral_door": "暗影门", + "item.cinderscapes.umbral_fence": "暗影栅栏", + "item.cinderscapes.umbral_fence_gate": "暗影栅栏门", + "item.cinderscapes.umbral_flesh_block": "暗影肉块", + "item.cinderscapes.umbral_fungus": "暗影真菌", + "item.cinderscapes.umbral_hanging_sign" : "悬挂式暗影告示牌", + "item.cinderscapes.umbral_hyphae": "暗影菌丝", + "item.cinderscapes.umbral_nylium": "暗影菌岩", + "item.cinderscapes.umbral_planks": "暗影木板", + "item.cinderscapes.umbral_pressure_plate": "暗影压力板", + "item.cinderscapes.umbral_sign": "暗影告示牌", + "item.cinderscapes.umbral_slab": "暗影台阶", + "item.cinderscapes.umbral_stairs": "暗影楼梯", + "item.cinderscapes.umbral_stem": "暗影树干", + "item.cinderscapes.umbral_trapdoor": "暗影活板门", + "item.cinderscapes.umbral_wart_block": "暗影疣块" } \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/radiant_roots.json b/client/src/main/resources/assets/cinderscapes/models/block/radiant_roots.json deleted file mode 100644 index 681376da..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/radiant_roots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/radiant_roots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/radiant_slate.json b/client/src/main/resources/assets/cinderscapes/models/block/radiant_slate.json deleted file mode 100644 index ce2e9bb3..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/radiant_slate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/radiant_slate" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/withered_fungus.json b/client/src/main/resources/assets/cinderscapes/models/block/withered_fungus.json deleted file mode 100644 index ea4c4790..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/withered_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "cinderscapes:block/withered_fungus" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/withered_nylium.json b/client/src/main/resources/assets/cinderscapes/models/block/withered_nylium.json deleted file mode 100644 index 4638628f..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/withered_nylium.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "cinderscapes:block/withered_nylium", - "bottom": "minecraft:block/netherrack", - "side": "cinderscapes:block/withered_nylium_side" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/withered_stem.json b/client/src/main/resources/assets/cinderscapes/models/block/withered_stem.json deleted file mode 100644 index 62f7a281..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/withered_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "cinderscapes:block/withered_stem_top", - "side": "cinderscapes:block/withered_stem" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/block/withered_wart_block.json b/client/src/main/resources/assets/cinderscapes/models/block/withered_wart_block.json deleted file mode 100644 index 19fb1dff..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/block/withered_wart_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "cinderscapes:block/withered_wart_block" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/radiant_roots.json b/client/src/main/resources/assets/cinderscapes/models/item/radiant_roots.json deleted file mode 100644 index 982afda5..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/radiant_roots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/radiant_roots" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/radiant_slate.json b/client/src/main/resources/assets/cinderscapes/models/item/radiant_slate.json deleted file mode 100644 index 5373990c..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/radiant_slate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/radiant_slate" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/withered_fungus.json b/client/src/main/resources/assets/cinderscapes/models/item/withered_fungus.json deleted file mode 100644 index 441772ba..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/withered_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cinderscapes:block/withered_fungus" - } -} \ No newline at end of file diff --git a/client/src/main/resources/assets/cinderscapes/models/item/withered_nylium.json b/client/src/main/resources/assets/cinderscapes/models/item/withered_nylium.json deleted file mode 100644 index 45eaf839..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/withered_nylium.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/withered_nylium" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/withered_stem.json b/client/src/main/resources/assets/cinderscapes/models/item/withered_stem.json deleted file mode 100644 index e2650ffa..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/withered_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/withered_stem" -} diff --git a/client/src/main/resources/assets/cinderscapes/models/item/withered_wart_block.json b/client/src/main/resources/assets/cinderscapes/models/item/withered_wart_block.json deleted file mode 100644 index 73ed5a59..00000000 --- a/client/src/main/resources/assets/cinderscapes/models/item/withered_wart_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cinderscapes:block/withered_wart_block" -} diff --git a/client/src/main/resources/assets/cinderscapes/sounds.json b/client/src/main/resources/assets/cinderscapes/sounds.json index 6a25b148..ea8550e0 100644 --- a/client/src/main/resources/assets/cinderscapes/sounds.json +++ b/client/src/main/resources/assets/cinderscapes/sounds.json @@ -1,6 +1,5 @@ { "music_disc.chilling_in_hell": { - "category": "music", "sounds": [ { "name": "cinderscapes:music/chilling_in_hell", @@ -9,7 +8,6 @@ ] }, "music_disc.luminous_plantation": { - "category": "music", "sounds": [ { "name": "cinderscapes:music/luminous_plantation", @@ -18,7 +16,6 @@ ] }, "music.nether.ashy_shoals": { - "category": "music", "sounds": [ { "name": "cinderscapes:music/chilling_in_hell", @@ -31,25 +28,24 @@ "weight": 3 }, { - "name": "music/game/nether/nether1", + "name": "music/game/nether/ballad_of_the_cats", "stream": true }, { - "name": "music/game/nether/nether2", + "name": "music/game/nether/concrete_halls", "stream": true }, { - "name": "music/game/nether/nether3", + "name": "music/game/nether/dead_voxel", "stream": true }, { - "name": "music/game/nether/nether4", + "name": "music/game/nether/warmth", "stream": true } ] }, "music.nether.blackstone_shales": { - "category": "music", "sounds": [ { "name": "music/game/nether/soulsand_valley/so_below", @@ -62,25 +58,24 @@ "weight": 3 }, { - "name": "music/game/nether/nether1", + "name": "music/game/nether/ballad_of_the_cats", "stream": true }, { - "name": "music/game/nether/nether2", + "name": "music/game/nether/concrete_halls", "stream": true }, { - "name": "music/game/nether/nether3", + "name": "music/game/nether/dead_voxel", "stream": true }, { - "name": "music/game/nether/nether4", + "name": "music/game/nether/warmth", "stream": true } ] }, "music.nether.luminous_grove": { - "category": "music", "sounds": [ { "name": "cinderscapes:music/luminous_plantation", @@ -93,25 +88,24 @@ "weight": 3 }, { - "name": "music/game/nether/nether1", + "name": "music/game/nether/ballad_of_the_cats", "stream": true }, { - "name": "music/game/nether/nether2", + "name": "music/game/nether/concrete_halls", "stream": true }, { - "name": "music/game/nether/nether3", + "name": "music/game/nether/dead_voxel", "stream": true }, { - "name": "music/game/nether/nether4", + "name": "music/game/nether/warmth", "stream": true } ] }, "music.nether.quartz_cavern": { - "category": "music", "sounds": [ { "name": "music/game/nether/nether_wastes/rubedo", @@ -124,25 +118,24 @@ "weight": 3 }, { - "name": "music/game/nether/nether1", + "name": "music/game/nether/ballad_of_the_cats", "stream": true }, { - "name": "music/game/nether/nether2", + "name": "music/game/nether/concrete_halls", "stream": true }, { - "name": "music/game/nether/nether3", + "name": "music/game/nether/dead_voxel", "stream": true }, { - "name": "music/game/nether/nether4", + "name": "music/game/nether/warmth", "stream": true } ] }, "music.menu": { - "category": "music", "sounds": [ { "name": "cinderscapes:music/ruins", diff --git a/client/src/main/resources/assets/minecraft/atlases/armor_trims.json b/client/src/main/resources/assets/minecraft/atlases/armor_trims.json index 6a064637..66720a95 100644 --- a/client/src/main/resources/assets/minecraft/atlases/armor_trims.json +++ b/client/src/main/resources/assets/minecraft/atlases/armor_trims.json @@ -3,38 +3,42 @@ { "type": "paletted_permutations", "textures": [ - "trims/models/armor/coast", - "trims/models/armor/coast_leggings", - "trims/models/armor/dune", - "trims/models/armor/dune_leggings", - "trims/models/armor/eye", - "trims/models/armor/eye_leggings", - "trims/models/armor/host", - "trims/models/armor/host_leggings", - "trims/models/armor/raiser", - "trims/models/armor/raiser_leggings", - "trims/models/armor/rib", - "trims/models/armor/rib_leggings", - "trims/models/armor/sentry", - "trims/models/armor/sentry_leggings", - "trims/models/armor/shaper", - "trims/models/armor/shaper_leggings", - "trims/models/armor/silence", - "trims/models/armor/silence_leggings", - "trims/models/armor/snout", - "trims/models/armor/snout_leggings", - "trims/models/armor/spire", - "trims/models/armor/spire_leggings", - "trims/models/armor/tide", - "trims/models/armor/tide_leggings", - "trims/models/armor/vex", - "trims/models/armor/vex_leggings", - "trims/models/armor/ward", - "trims/models/armor/ward_leggings", - "trims/models/armor/wayfinder", - "trims/models/armor/wayfinder_leggings", - "trims/models/armor/wild", - "trims/models/armor/wild_leggings" + "trims/entity/humanoid/bolt", + "trims/entity/humanoid_leggings/bolt", + "trims/entity/humanoid/flow", + "trims/entity/humanoid_leggings/flow", + "trims/entity/humanoid/coast", + "trims/entity/humanoid_leggings/coast", + "trims/entity/humanoid/sentry", + "trims/entity/humanoid_leggings/sentry", + "trims/entity/humanoid/dune", + "trims/entity/humanoid_leggings/dune", + "trims/entity/humanoid/wild", + "trims/entity/humanoid_leggings/wild", + "trims/entity/humanoid/ward", + "trims/entity/humanoid_leggings/ward", + "trims/entity/humanoid/eye", + "trims/entity/humanoid_leggings/eye", + "trims/entity/humanoid/vex", + "trims/entity/humanoid_leggings/vex", + "trims/entity/humanoid/tide", + "trims/entity/humanoid_leggings/tide", + "trims/entity/humanoid/snout", + "trims/entity/humanoid_leggings/snout", + "trims/entity/humanoid/rib", + "trims/entity/humanoid_leggings/rib", + "trims/entity/humanoid/spire", + "trims/entity/humanoid_leggings/spire", + "trims/entity/humanoid/silence", + "trims/entity/humanoid_leggings/silence", + "trims/entity/humanoid/wayfinder", + "trims/entity/humanoid_leggings/wayfinder", + "trims/entity/humanoid/raiser", + "trims/entity/humanoid_leggings/raiser", + "trims/entity/humanoid/shaper", + "trims/entity/humanoid_leggings/shaper", + "trims/entity/humanoid/host", + "trims/entity/humanoid_leggings/host" ], "palette_key": "trims/color_palettes/trim_palette", "permutations": { diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json b/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json index 1c578b0c..2b9efdee 100644 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json +++ b/client/src/main/resources/assets/minecraft/models/item/diamond_boots.json @@ -61,6 +61,12 @@ "trim_type": 0.7 } }, + { + "model": "minecraft:item/diamond_boots_diamond_darker_trim", + "predicate": { + "trim_type": 0.8 + } + }, { "model": "minecraft:item/diamond_boots_lapis_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json index 07709ad4..7564f94e 100644 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json +++ b/client/src/main/resources/assets/minecraft/models/item/diamond_chestplate.json @@ -61,6 +61,12 @@ "trim_type": 0.7 } }, + { + "model": "minecraft:item/diamond_chestplate_diamond_darker_trim", + "predicate": { + "trim_type": 0.8 + } + }, { "model": "minecraft:item/diamond_chestplate_lapis_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json b/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json index 007d5b65..adfd4444 100644 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json +++ b/client/src/main/resources/assets/minecraft/models/item/diamond_helmet.json @@ -61,6 +61,12 @@ "trim_type": 0.7 } }, + { + "model": "minecraft:item/diamond_helmet_diamond_darker_trim", + "predicate": { + "trim_type": 0.8 + } + }, { "model": "minecraft:item/diamond_helmet_lapis_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json b/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json index df90e358..6b82168c 100644 --- a/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json +++ b/client/src/main/resources/assets/minecraft/models/item/diamond_leggings.json @@ -61,6 +61,12 @@ "trim_type": 0.7 } }, + { + "model": "minecraft:item/diamond_leggings_diamond_darker_trim", + "predicate": { + "trim_type": 0.8 + } + }, { "model": "minecraft:item/diamond_leggings_lapis_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_boots.json b/client/src/main/resources/assets/minecraft/models/item/golden_boots.json index d97a0844..ce836ce0 100644 --- a/client/src/main/resources/assets/minecraft/models/item/golden_boots.json +++ b/client/src/main/resources/assets/minecraft/models/item/golden_boots.json @@ -43,6 +43,12 @@ "trim_type": 0.5 } }, + { + "model": "minecraft:item/golden_boots_gold_darker_trim", + "predicate": { + "trim_type": 0.6 + } + }, { "model": "cinderscapes:item/golden_boots_sulfur_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json index cc544768..46761b1b 100644 --- a/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json +++ b/client/src/main/resources/assets/minecraft/models/item/golden_chestplate.json @@ -43,6 +43,12 @@ "trim_type": 0.5 } }, + { + "model": "minecraft:item/golden_chestplate_gold_darker_trim", + "predicate": { + "trim_type": 0.6 + } + }, { "model": "cinderscapes:item/golden_chestplate_sulfur_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json b/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json index fba99036..dcc71efa 100644 --- a/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json +++ b/client/src/main/resources/assets/minecraft/models/item/golden_helmet.json @@ -43,6 +43,12 @@ "trim_type": 0.5 } }, + { + "model": "minecraft:item/golden_helmet_gold_darker_trim", + "predicate": { + "trim_type": 0.6 + } + }, { "model": "cinderscapes:item/golden_helmet_sulfur_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json b/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json index c409b9dc..7f0eb3aa 100644 --- a/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json +++ b/client/src/main/resources/assets/minecraft/models/item/golden_leggings.json @@ -43,6 +43,12 @@ "trim_type": 0.5 } }, + { + "model": "minecraft:item/golden_leggings_gold_darker_trim", + "predicate": { + "trim_type": 0.6 + } + }, { "model": "cinderscapes:item/golden_leggings_sulfur_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_boots.json b/client/src/main/resources/assets/minecraft/models/item/iron_boots.json index c812beb7..22bd0c64 100644 --- a/client/src/main/resources/assets/minecraft/models/item/iron_boots.json +++ b/client/src/main/resources/assets/minecraft/models/item/iron_boots.json @@ -7,6 +7,12 @@ "trim_type": 0.1 } }, + { + "model": "minecraft:item/iron_boots_iron_darker_trim", + "predicate": { + "trim_type": 0.2 + } + }, { "model": "minecraft:item/iron_boots_netherite_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json index ede6bb4e..f0e3cc4d 100644 --- a/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json +++ b/client/src/main/resources/assets/minecraft/models/item/iron_chestplate.json @@ -7,6 +7,12 @@ "trim_type": 0.1 } }, + { + "model": "minecraft:item/iron_chestplate_iron_darker_trim", + "predicate": { + "trim_type": 0.2 + } + }, { "model": "minecraft:item/iron_chestplate_netherite_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json b/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json index a3855a25..5f272a6a 100644 --- a/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json +++ b/client/src/main/resources/assets/minecraft/models/item/iron_helmet.json @@ -7,6 +7,12 @@ "trim_type": 0.1 } }, + { + "model": "minecraft:item/iron_helmet_iron_darker_trim", + "predicate": { + "trim_type": 0.2 + } + }, { "model": "minecraft:item/iron_helmet_netherite_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json b/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json index 153a6309..c39c51e1 100644 --- a/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json +++ b/client/src/main/resources/assets/minecraft/models/item/iron_leggings.json @@ -7,6 +7,12 @@ "trim_type": 0.1 } }, + { + "model": "minecraft:item/iron_leggings_iron_darker_trim", + "predicate": { + "trim_type": 0.2 + } + }, { "model": "minecraft:item/iron_leggings_netherite_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json b/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json index 9992a329..72d1ad38 100644 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json +++ b/client/src/main/resources/assets/minecraft/models/item/netherite_boots.json @@ -13,6 +13,12 @@ "trim_type": 0.2 } }, + { + "model": "minecraft:item/netherite_boots_netherite_darker_trim", + "predicate": { + "trim_type": 0.3 + } + }, { "model": "cinderscapes:item/netherite_boots_smoky_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json b/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json index d28c83ee..54555307 100644 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json +++ b/client/src/main/resources/assets/minecraft/models/item/netherite_chestplate.json @@ -13,6 +13,12 @@ "trim_type": 0.2 } }, + { + "model": "minecraft:item/netherite_chestplate_netherite_darker_trim", + "predicate": { + "trim_type": 0.3 + } + }, { "model": "cinderscapes:item/netherite_chestplate_smoky_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json b/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json index 94559c22..6434969c 100644 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json +++ b/client/src/main/resources/assets/minecraft/models/item/netherite_helmet.json @@ -13,6 +13,12 @@ "trim_type": 0.2 } }, + { + "model": "minecraft:item/netherite_helmet_netherite_darker_trim", + "predicate": { + "trim_type": 0.3 + } + }, { "model": "cinderscapes:item/netherite_helmet_smoky_quartz_trim", "predicate": { diff --git a/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json b/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json index fdc6e861..611d9c51 100644 --- a/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json +++ b/client/src/main/resources/assets/minecraft/models/item/netherite_leggings.json @@ -13,6 +13,12 @@ "trim_type": 0.2 } }, + { + "model": "minecraft:item/netherite_leggings_netherite_darker_trim", + "predicate": { + "trim_type": 0.3 + } + }, { "model": "cinderscapes:item/netherite_leggings_smoky_quartz_trim", "predicate": { diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java b/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java index d7a59f66..a13a33fb 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java @@ -16,7 +16,7 @@ public class Cinderscapes implements ModInitializer { public static final Logger LOGGER = LogManager.getLogger(StringUtils.capitalize(MOD_ID)); private static Boolean initialized = false; - private static final ArrayList runnables = new ArrayList<>(1); + private static final ArrayList RUNNABLES = new ArrayList<>(1); @Override public void onInitialize() { @@ -37,7 +37,7 @@ public void onInitialize() { // At this point Cinderscapes is completely initialized. initialized = true; - for (Runnable callback : runnables) { + for (Runnable callback : RUNNABLES) { callback.run(); } } @@ -46,7 +46,7 @@ public static void callbackWhenInitialized(Runnable callback) { if (initialized) { callback.run(); } else { - runnables.add(callback); + RUNNABLES.add(callback); } } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java b/common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java index c29c1c0e..e0fba68f 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java @@ -59,7 +59,7 @@ private static GenerationSettings createGenerationSettings(Registerable r GenerationSettings.LookupBackedBuilder builder = new GenerationSettings.LookupBackedBuilder(placedFeatures, configuredCarvers); // DEFAULT MINECRAFT FEATURES - builder.carver(GenerationStep.Carver.AIR, ConfiguredCarvers.NETHER_CAVE); + builder.carver(ConfiguredCarvers.NETHER_CAVE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.GLOWSTONE_EXTRA); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.GLOWSTONE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, OrePlacedFeatures.ORE_MAGMA); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java b/common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java index 9af7493f..0fb5db72 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java @@ -56,7 +56,7 @@ private static GenerationSettings createGenerationSettings(Registerable r GenerationSettings.LookupBackedBuilder builder = new GenerationSettings.LookupBackedBuilder(placedFeatures, configuredCarvers); // DEFAULT MINECRAFT FEATURES - builder.carver(GenerationStep.Carver.AIR, ConfiguredCarvers.NETHER_CAVE); + builder.carver(ConfiguredCarvers.NETHER_CAVE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.SPRING_DELTA); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.PATCH_FIRE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.PATCH_SOUL_FIRE); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java b/common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java index b923e1e2..81f3217b 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java @@ -59,7 +59,7 @@ private static GenerationSettings createGenerationSettings(Registerable r GenerationSettings.LookupBackedBuilder builder = new GenerationSettings.LookupBackedBuilder(placedFeatures, configuredCarvers); // DEFAULT MINECRAFT FEATURES - builder.carver(GenerationStep.Carver.AIR, ConfiguredCarvers.NETHER_CAVE); + builder.carver(ConfiguredCarvers.NETHER_CAVE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.GLOWSTONE_EXTRA); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.GLOWSTONE); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, OrePlacedFeatures.ORE_MAGMA); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java b/common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java index 67bd498e..bd8fddf9 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java @@ -56,7 +56,7 @@ private static GenerationSettings createGenerationSettings(Registerable r GenerationSettings.LookupBackedBuilder builder = new GenerationSettings.LookupBackedBuilder(placedFeatures, configuredCarvers); // DEFAULT MINECRAFT FEATURES - builder.carver(GenerationStep.Carver.AIR, ConfiguredCarvers.NETHER_CAVE); + builder.carver(ConfiguredCarvers.NETHER_CAVE); builder.feature(GenerationStep.Feature.VEGETAL_DECORATION, MiscPlacedFeatures.SPRING_LAVA); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.SPRING_DELTA); builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, NetherPlacedFeatures.PATCH_FIRE); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java index 403b6379..00761d36 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/BrambleBerryBushBlock.java @@ -13,6 +13,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; @@ -47,8 +48,8 @@ public void onEntityCollision(BlockState state, World world, BlockPos pos, Entit if (!world.isClient && state.get(AGE) > 0 && (entity.lastRenderX != entity.getX() || entity.lastRenderZ != entity.getZ())) { double d = Math.abs(entity.getX() - entity.lastRenderX); double e = Math.abs(entity.getZ() - entity.lastRenderZ); - if (d >= 0.003000000026077032D || e >= 0.003000000026077032D) { - entity.damage(world.getDamageSources().sweetBerryBush(), 1.0f); + if (world instanceof ServerWorld serverWorld && (d >= 0.003000000026077032D || e >= 0.003000000026077032D)) { + entity.damage(serverWorld, world.getDamageSources().sweetBerryBush(), 1.0f); } } } @@ -75,7 +76,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt world.setBlockState(pos, newState, 2); world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(player, newState)); - return ActionResult.success(world.isClient); + return ActionResult.SUCCESS; } return super.onUse(state, world, pos, player, hit); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherPlantBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherPlantBlock.java index 771b2108..b380de08 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherPlantBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherPlantBlock.java @@ -16,7 +16,7 @@ public class CinderscapesNetherPlantBlock extends PlantBlock { public static final MapCodec CODEC = CinderscapesNetherPlantBlock.createCodec(CinderscapesNetherPlantBlock::new); - public CinderscapesNetherPlantBlock(Settings settings, StateShapeSupplier supplier) { + public CinderscapesNetherPlantBlock(StateShapeSupplier supplier, Settings settings) { super(settings.offset(AbstractBlock.OffsetType.XZ)); StateShapeRegistry.put(this, supplier); @@ -37,7 +37,6 @@ protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) } @Override - @SuppressWarnings("deprecation") public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { return StateShapeRegistry.getShape(state); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherTallPlantBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherTallPlantBlock.java index 1db879c1..3f4d5558 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherTallPlantBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/CinderscapesNetherTallPlantBlock.java @@ -15,7 +15,7 @@ public class CinderscapesNetherTallPlantBlock extends TallPlantBlock { public static final MapCodec CODEC = CinderscapesNetherTallPlantBlock.createCodec(CinderscapesNetherTallPlantBlock::new); - public CinderscapesNetherTallPlantBlock(Settings settings, StateShapeSupplier supplier) { + public CinderscapesNetherTallPlantBlock(StateShapeSupplier supplier, Settings settings) { super(settings); StateShapeRegistry.put(this, supplier); @@ -38,7 +38,6 @@ protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) } @Override - @SuppressWarnings("deprecation") public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { return StateShapeRegistry.getShape(state); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java index c88fe7bb..bb8ae12b 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/CrystiniumBlock.java @@ -3,8 +3,9 @@ import com.terraformersmc.cinderscapes.util.StateShapeRegistry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -14,8 +15,8 @@ import net.minecraft.world.World; public class CrystiniumBlock extends CinderscapesNetherPlantBlock { - public CrystiniumBlock() { - super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.YELLOW)); + public CrystiniumBlock(Settings settings) { + super(settings); StateShapeRegistry.put(this, (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)); } @@ -34,7 +35,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - Vec3d modelOffset = state.getModelOffset(world, pos); + Vec3d modelOffset = state.getModelOffset(pos); return super.getOutlineShape(state, world, pos, context).offset(modelOffset.x, modelOffset.y, modelOffset.z); } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/GhastlyEctoplasmBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/GhastlyEctoplasmBlock.java index d98a4017..d6981f8e 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/GhastlyEctoplasmBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/GhastlyEctoplasmBlock.java @@ -9,11 +9,12 @@ import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import java.util.Locale; @@ -26,7 +27,6 @@ public GhastlyEctoplasmBlock(Settings settings) { } @Override - @SuppressWarnings("deprecation") public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { return state.get(GhastlyEctoplasmBlock.TYPE) == GhastlyEctoplasmBlock.Type.BOTTOM ? Block.createCuboidShape(3.0D, 2.5D, 3.0D, 13.0D, 16.0D, 13.0D) : Block.createCuboidShape(1.0D, 0.0D, 1.0D, 15.0D, 16.0D, 15.0D); } @@ -45,11 +45,11 @@ public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { return evaluateState(state, pos, world); } - public BlockState evaluateState(BlockState currentState, BlockPos currentPos, WorldAccess world) { + public BlockState evaluateState(BlockState currentState, BlockPos currentPos, WorldView world) { BlockState aboveState = world.getBlockState(currentPos.up()); BlockState belowState = world.getBlockState(currentPos.down()); BlockState twoBelowState = world.getBlockState(currentPos.down(2)); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java index 3edfab70..06dd9559 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/PhotofernBlock.java @@ -2,8 +2,10 @@ import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; import com.terraformersmc.cinderscapes.util.StateShapeRegistry; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Fertilizable; +import net.minecraft.block.TallPlantBlock; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; @@ -12,8 +14,8 @@ public class PhotofernBlock extends CinderscapesNetherPlantBlock implements Fertilizable { - public PhotofernBlock() { - super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE)); + public PhotofernBlock(Settings settings) { + super(settings); StateShapeRegistry.put(this, (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PolypiteQuartzBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PolypiteQuartzBlock.java index 18f2b6c2..b21a4f61 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/PolypiteQuartzBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/PolypiteQuartzBlock.java @@ -10,9 +10,11 @@ import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; import org.jetbrains.annotations.Nullable; import java.util.HashMap; @@ -33,7 +35,7 @@ protected void appendProperties(StateManager.Builder builder) } @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { Direction placementSide = state.get(DIRECTION); if (!Block.isFaceFullSquare(world.getBlockState(pos.offset(placementSide)).getCollisionShape(world, pos.offset(placementSide)), placementSide.getOpposite())) { return Blocks.AIR.getDefaultState(); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedCrystiniumBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedCrystiniumBlock.java index 20096f1e..378bafaa 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedCrystiniumBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedCrystiniumBlock.java @@ -3,9 +3,7 @@ import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.FlowerPotBlock; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; @@ -13,8 +11,8 @@ import net.minecraft.world.World; public class PottedCrystiniumBlock extends FlowerPotBlock { - public PottedCrystiniumBlock() { - super(CinderscapesBlocks.CRYSTINIUM, FabricBlockSettings.copyOf(Blocks.POTTED_ALLIUM)); + public PottedCrystiniumBlock(Settings settings) { + super(CinderscapesBlocks.CRYSTINIUM, settings); } @Override diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedPyracinthBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedPyracinthBlock.java index b815c87f..63045610 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedPyracinthBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/PottedPyracinthBlock.java @@ -3,9 +3,7 @@ import com.terraformersmc.cinderscapes.init.CinderscapesBlocks; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.FlowerPotBlock; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; @@ -13,8 +11,8 @@ import net.minecraft.world.World; public class PottedPyracinthBlock extends FlowerPotBlock { - public PottedPyracinthBlock() { - super(CinderscapesBlocks.PYRACINTH, FabricBlockSettings.copyOf(Blocks.POTTED_ALLIUM)); + public PottedPyracinthBlock(Settings settings) { + super(CinderscapesBlocks.PYRACINTH, settings); } @Override diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java b/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java index 36a8a05f..169f2d31 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/block/PyracinthBlock.java @@ -3,8 +3,9 @@ import com.terraformersmc.cinderscapes.util.StateShapeRegistry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -14,8 +15,8 @@ import net.minecraft.world.World; public class PyracinthBlock extends CinderscapesNetherPlantBlock { - public PyracinthBlock() { - super(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.ORANGE)); + public PyracinthBlock(Settings settings) { + super(settings); StateShapeRegistry.put(this, (state) -> Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 16.0, 11.0)); } @@ -35,7 +36,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - Vec3d modelOffset = state.getModelOffset(world, pos); + Vec3d modelOffset = state.getModelOffset(pos); return super.getOutlineShape(state, world, pos, context).offset(modelOffset.x, modelOffset.y, modelOffset.z); } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java index 5bcb1226..4c3508d0 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java @@ -7,7 +7,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.minecraft.block.Blocks; -import net.minecraft.data.server.loottable.vanilla.VanillaBlockLootTableGenerator; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.Items; @@ -35,7 +34,7 @@ protected CinderscapesBlockLootTableProvider(FabricDataOutput output, Completabl @Override public void generate() { - RegistryWrapper.Impl enchantmentRegistry = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + RegistryWrapper.Impl enchantmentRegistry = this.registries.getOrThrow(RegistryKeys.ENCHANTMENT); // simple blocks addDrop(CinderscapesBlocks.ASH_BLOCK); @@ -47,8 +46,8 @@ public void generate() { addDrop(CinderscapesBlocks.CRYSTALLINE_SMOKY_QUARTZ, block -> oreDrops(block, CinderscapesItems.SMOKY_QUARTZ)); addDrop(CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ, block -> oreDrops(block, CinderscapesItems.SULFUR_QUARTZ)); addDrop(CinderscapesBlocks.CRYSTINIUM); - addDrop(CinderscapesBlocks.GHASTLY_ECTOPLASM, VanillaBlockLootTableGenerator::dropsWithShears); - addDrop(CinderscapesBlocks.PHOTOFERN, VanillaBlockLootTableGenerator::dropsWithShears); + addDrop(CinderscapesBlocks.GHASTLY_ECTOPLASM, this::dropsWithShears); + addDrop(CinderscapesBlocks.PHOTOFERN, this::dropsWithShears); addDrop(CinderscapesBlocks.POLYPITE_QUARTZ, block -> oreDrops(block, Items.QUARTZ)); addDrop(CinderscapesBlocks.POLYPITE_ROSE_QUARTZ, block -> oreDrops(block, CinderscapesItems.ROSE_QUARTZ)); addDrop(CinderscapesBlocks.POLYPITE_SMOKY_QUARTZ, block -> oreDrops(block, CinderscapesItems.SMOKY_QUARTZ)); @@ -60,8 +59,8 @@ public void generate() { addDrop(CinderscapesBlocks.ROSE_QUARTZ_PILLAR); addDrop(CinderscapesBlocks.ROSE_QUARTZ_SLAB, this::slabDrops); addDrop(CinderscapesBlocks.ROSE_QUARTZ_STAIRS); - addDrop(CinderscapesBlocks.SCORCHED_SHRUB, VanillaBlockLootTableGenerator::dropsWithShears); - addDrop(CinderscapesBlocks.SCORCHED_SPROUTS, VanillaBlockLootTableGenerator::dropsWithShears); + addDrop(CinderscapesBlocks.SCORCHED_SHRUB, this::dropsWithShears); + addDrop(CinderscapesBlocks.SCORCHED_SPROUTS, this::dropsWithShears); addDrop(CinderscapesBlocks.SCORCHED_TENDRILS); addDrop(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); addDrop(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS); @@ -86,7 +85,7 @@ public void generate() { addDrop(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR); addDrop(CinderscapesBlocks.SULFUR_QUARTZ_SLAB, this::slabDrops); addDrop(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS); - addDrop(CinderscapesBlocks.TWILIGHT_FESCUES, VanillaBlockLootTableGenerator::dropsWithShears); + addDrop(CinderscapesBlocks.TWILIGHT_FESCUES, this::dropsWithShears); addDrop(CinderscapesBlocks.TWILIGHT_TENDRILS); addDrop(CinderscapesBlocks.TWILIGHT_VINE_BLOCK); addDrop(CinderscapesBlocks.UMBRAL_FLESH_BLOCK); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java index a72d0e85..1b3a7e85 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java @@ -217,7 +217,7 @@ public void configure(RegistryWrapper.WrapperLookup registries) { .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); - getOrCreateTagBuilder(CinderscapesBlockTags.STRIPPED_WOOD) + getOrCreateTagBuilder(CinderscapesBlockTags.STRIPPED_WOODS) .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE); diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java index 43b7e607..d4620495 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesDynamicRegistryProvider.java @@ -33,12 +33,12 @@ public static void buildRegistry(RegistryBuilder registryBuilder) { @Override public void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { // worldgen - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.CONFIGURED_FEATURE), Cinderscapes.MOD_ID); - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.PLACED_FEATURE), Cinderscapes.MOD_ID); - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.BIOME), Cinderscapes.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.CONFIGURED_FEATURE), Cinderscapes.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.PLACED_FEATURE), Cinderscapes.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.BIOME), Cinderscapes.MOD_ID); // other registries - addAll(entries, registries.getWrapperOrThrow(RegistryKeys.TRIM_MATERIAL), Cinderscapes.MOD_ID); + addAll(entries, registries.getOrThrow(RegistryKeys.TRIM_MATERIAL), Cinderscapes.MOD_ID); } @Override diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java index be6f700b..01c04f37 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java @@ -98,8 +98,8 @@ public void configure(RegistryWrapper.WrapperLookup registries) { // conventional tags - getOrCreateTagBuilder(ConventionalItemTags.BERRIES_FOODS) - .add(CinderscapesItems.BRAMBLE_BERRIES); + getOrCreateTagBuilder(ConventionalItemTags.BERRY_FOODS) + .add(CinderscapesItems.BRAMBLE_BERRIES); getOrCreateTagBuilder(CinderscapesItemTags.DARK_ASHES_DUSTS) .add(CinderscapesItems.ASH_PILE); @@ -146,7 +146,7 @@ public void configure(RegistryWrapper.WrapperLookup registries) { copy(CinderscapesBlockTags.STRIPPED_LOGS, CinderscapesItemTags.STRIPPED_LOGS); - copy(CinderscapesBlockTags.STRIPPED_WOOD, CinderscapesItemTags.STRIPPED_WOOD); + copy(CinderscapesBlockTags.STRIPPED_WOODS, CinderscapesItemTags.STRIPPED_WOODS); getOrCreateTagBuilder(CinderscapesItemTags.SULFURS_ORES) .add(CinderscapesBlocks.SULFUR_ORE.asItem()); @@ -182,6 +182,7 @@ public void configure(RegistryWrapper.WrapperLookup registries) { .add(CinderscapesItems.ROSE_QUARTZ) .add(CinderscapesItems.SMOKY_QUARTZ) .add(CinderscapesItems.SULFUR_QUARTZ); + getOrCreateTagBuilder(CinderscapesItemTags.SULFUR_ORES) .add(CinderscapesBlocks.SULFUR_ORE.asItem()); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java index f2247943..e5167fa7 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesRecipeProvider.java @@ -9,13 +9,13 @@ import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; import net.minecraft.advancement.criterion.InventoryChangedCriterion; import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.server.recipe.RecipeGenerator; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; @@ -30,266 +30,274 @@ protected CinderscapesRecipeProvider(FabricDataOutput output, CompletableFuture< } @Override - public void generate(RecipeExporter exporter) { - // vanilla recipes - ShapedRecipeJsonBuilder.create(RecipeCategory.REDSTONE, Items.COMPARATOR, 1) - .pattern(" T ") - .pattern("TQT") - .pattern("SSS") - .input('T', Items.REDSTONE_TORCH) - .input('Q', ConventionalItemTags.QUARTZ_GEMS) - .input('S', Items.STONE) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(ConventionalItemTags.QUARTZ_GEMS))) - .offerTo(exporter, Identifier.ofVanilla("comparator")); + public RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registryLookup, RecipeExporter exporter) { + return new RecipeGenerator(registryLookup, exporter) { + @Override + public void generate() { + // vanilla recipes + createShaped(RecipeCategory.REDSTONE, Items.COMPARATOR, 1) + .pattern(" T ") + .pattern("TQT") + .pattern("SSS") + .input('T', Items.REDSTONE_TORCH) + .input('Q', ConventionalItemTags.QUARTZ_GEMS) + .input('S', Items.STONE) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.REDSTONE, Items.DAYLIGHT_DETECTOR, 1) - .pattern("GGG") - .pattern("QQQ") - .pattern("WWW") - .input('G', Items.GLASS) - .input('Q', ConventionalItemTags.QUARTZ_GEMS) - .input('W', ItemTags.WOODEN_SLABS) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(ConventionalItemTags.QUARTZ_GEMS))) - .offerTo(exporter, Identifier.ofVanilla("daylight_detector")); + createShaped(RecipeCategory.REDSTONE, Items.DAYLIGHT_DETECTOR, 1) + .pattern("GGG") + .pattern("QQQ") + .pattern("WWW") + .input('G', Items.GLASS) + .input('Q', ConventionalItemTags.QUARTZ_GEMS) + .input('W', ItemTags.WOODEN_SLABS) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.REDSTONE, Items.OBSERVER, 1) - .pattern("CCC") - .pattern("RRQ") - .pattern("CCC") - .input('C', Items.COBBLESTONE) - .input('Q', ConventionalItemTags.QUARTZ_GEMS) - .input('R', Items.REDSTONE) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(ConventionalItemTags.QUARTZ_GEMS))) - .offerTo(exporter, Identifier.ofVanilla("observer")); + createShaped(RecipeCategory.REDSTONE, Items.OBSERVER, 1) + .pattern("CCC") + .pattern("RRQ") + .pattern("CCC") + .input('C', Items.COBBLESTONE) + .input('Q', ConventionalItemTags.QUARTZ_GEMS) + .input('R', Items.REDSTONE) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, ConventionalItemTags.QUARTZ_GEMS))) + .offerTo(exporter); - // misc. recipes - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, CinderscapesBlocks.ASH, 6) - .pattern("AAA") - .input('A', CinderscapesBlocks.ASH_BLOCK) - .criterion("has_ash_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ASH_BLOCK)) - .offerTo(exporter); + // misc. recipes + createShaped(RecipeCategory.DECORATIONS, CinderscapesBlocks.ASH, 6) + .pattern("AAA") + .input('A', CinderscapesBlocks.ASH_BLOCK) + .criterion("has_ash_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ASH_BLOCK)) + .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ASH_BLOCK, 1) - .pattern("aa") - .pattern("aa") - .input('a', CinderscapesItems.ASH_PILE) - .criterion("has_ash_piles", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ASH_PILE)) - .offerTo(exporter); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ASH_BLOCK, 1) + .pattern("aa") + .pattern("aa") + .input('a', CinderscapesItems.ASH_PILE) + .criterion("has_ash_piles", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ASH_PILE)) + .offerTo(exporter); - ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, Items.GUNPOWDER, 1) - .input(CinderscapesItemTags.SULFURS) - .input(ItemTags.COALS) - .input(Items.BONE_MEAL) - .criterion("has_sulfurs", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.SULFURS))) - .offerTo(exporter); + createShapeless(RecipeCategory.MISC, Items.GUNPOWDER, 1) + .input(CinderscapesItemTags.SULFURS) + .input(ItemTags.COALS) + .input(Items.BONE_MEAL) + .criterion("has_sulfurs", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFURS))) + .offerTo(exporter); - offerReversibleCompactingRecipes(exporter, - RecipeCategory.MISC, CinderscapesItems.SULFUR, - RecipeCategory.BUILDING_BLOCKS, - CinderscapesBlocks.SULFUR_BLOCK); + offerReversibleCompactingRecipes(RecipeCategory.MISC, + CinderscapesItems.SULFUR, + RecipeCategory.BUILDING_BLOCKS, + CinderscapesBlocks.SULFUR_BLOCK); - offerBlasting(exporter, - List.of(CinderscapesItems.SULFUR_ORE), - RecipeCategory.MISC, - CinderscapesItems.SULFUR, - 0.1f, 100, "blasting"); + offerBlasting(List.of(CinderscapesItems.SULFUR_ORE), + RecipeCategory.MISC, + CinderscapesItems.SULFUR, + 0.1f, 100, "blasting"); - offerSmelting(exporter, - List.of(CinderscapesItems.SULFUR_ORE), - RecipeCategory.MISC, - CinderscapesItems.SULFUR, - 0.1f, 200, "smelting"); + offerSmelting(List.of(CinderscapesItems.SULFUR_ORE), + RecipeCategory.MISC, + CinderscapesItems.SULFUR, + 0.1f, 200, "smelting"); - // quartz recipes - offerChiseledBlockRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_SLAB); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.ROSE_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.ROSE_QUARTZ, 0.2f, 200, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, 1) - .pattern("qq") - .pattern("qq") - .input('q', CinderscapesItems.ROSE_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ROSE_QUARTZ)) - .offerTo(exporter); - offerPolishedStoneRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); - offerBlasting(exporter, List.of(CinderscapesBlocks.ROSE_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.ROSE_QUARTZ, 0.2f, 100, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_PILLAR, 2) - .pattern("Q") - .pattern("Q") - .input('Q', CinderscapesBlocks.ROSE_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ROSE_QUARTZ_BLOCK)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_PILLAR, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); - createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, 2); - createStairsRecipe(CinderscapesBlocks.ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_STAIRS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.ROSE_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 0.1f, 200, "building_blocks"); - offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 2); - createStairsRecipe(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); + // quartz recipes + offerChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_SLAB); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.ROSE_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.ROSE_QUARTZ, 0.2f, 200, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, 1) + .pattern("qq") + .pattern("qq") + .input('q', CinderscapesItems.ROSE_QUARTZ) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.ROSE_QUARTZ)) + .offerTo(exporter); + offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_BRICKS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + offerBlasting(List.of(CinderscapesBlocks.ROSE_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.ROSE_QUARTZ, 0.2f, 100, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_PILLAR, 2) + .pattern("Q") + .pattern("Q") + .input('Q', CinderscapesBlocks.ROSE_QUARTZ_BLOCK) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.ROSE_QUARTZ_BLOCK)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_PILLAR, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_SLAB, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, 2); + createStairsRecipe(CinderscapesBlocks.ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_BLOCK, CinderscapesBlocks.ROSE_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.ROSE_QUARTZ_STAIRS, CinderscapesBlocks.ROSE_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.ROSE_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 0.1f, 200, "building_blocks"); + offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ, 2); + createStairsRecipe(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) + .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_ROSE_QUARTZ); - offerChiseledBlockRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_SLAB); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.SMOKY_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SMOKY_QUARTZ, 0.2f, 200, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, 1) - .pattern("qq") - .pattern("qq") - .input('q', CinderscapesItems.SMOKY_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SMOKY_QUARTZ)) - .offerTo(exporter); - offerPolishedStoneRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); - offerBlasting(exporter, List.of(CinderscapesBlocks.SMOKY_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SMOKY_QUARTZ, 0.2f, 100, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, 2) - .pattern("Q") - .pattern("Q") - .input('Q', CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); - createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, 2); - createStairsRecipe(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 0.1f, 200, "building_blocks"); - offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 2); - createStairsRecipe(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); + offerChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_SLAB); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.SMOKY_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SMOKY_QUARTZ, 0.2f, 200, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, 1) + .pattern("qq") + .pattern("qq") + .input('q', CinderscapesItems.SMOKY_QUARTZ) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SMOKY_QUARTZ)) + .offerTo(exporter); + offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_BRICKS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + offerBlasting(List.of(CinderscapesBlocks.SMOKY_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SMOKY_QUARTZ, 0.2f, 100, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, 2) + .pattern("Q") + .pattern("Q") + .input('Q', CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, 2); + createStairsRecipe(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK, CinderscapesBlocks.SMOKY_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOKY_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 0.1f, 200, "building_blocks"); + offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ, 2); + createStairsRecipe(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) + .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ); - offerChiseledBlockRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_SLAB); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.SULFUR_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SULFUR_QUARTZ, 0.2f, 200, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, 1) - .pattern("qq") - .pattern("qq") - .input('q', CinderscapesItems.SULFUR_QUARTZ) - .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SULFUR_QUARTZ)) - .offerTo(exporter); - offerPolishedStoneRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); - offerBlasting(exporter, List.of(CinderscapesBlocks.SULFUR_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SULFUR_QUARTZ, 0.2f, 100, "misc"); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, 2) - .pattern("Q") - .pattern("Q") - .input('Q', CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); - createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, 2); - createStairsRecipe(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) - .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); - offerSmelting(exporter, List.of(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 0.1f, 200, "building_blocks"); - offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 2); - createStairsRecipe(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) - .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) - .offerTo(exporter); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); + offerChiseledBlockRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_SLAB); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.SULFUR_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SULFUR_QUARTZ, 0.2f, 200, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, 1) + .pattern("qq") + .pattern("qq") + .input('q', CinderscapesItems.SULFUR_QUARTZ) + .criterion("has_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesItems.SULFUR_QUARTZ)) + .offerTo(exporter); + offerPolishedStoneRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_BRICKS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + offerBlasting(List.of(CinderscapesBlocks.SULFUR_QUARTZ_ORE), RecipeCategory.MISC, CinderscapesItems.SULFUR_QUARTZ, 0.2f, 100, "misc"); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, 2) + .pattern("Q") + .pattern("Q") + .input('Q', CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, 2); + createStairsRecipe(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK, CinderscapesBlocks.SULFUR_QUARTZ_PILLAR)) + .criterion("has_quartz_blocks", InventoryChangedCriterion.Conditions.items(getItemTagPredicate(registryLookup, CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES))) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SULFUR_QUARTZ_BLOCK); + offerSmelting(List.of(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK), RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 0.1f, 200, "building_blocks"); + offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ, 2); + createStairsRecipe(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) + .criterion("has_smooth_quartz", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ)) + .offerTo(exporter); + offerStonecuttingRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS, CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ); - // wood recipes - offerSingleOutputShapelessRecipe(exporter, CinderscapesBlocks.SCORCHED_BUTTON, CinderscapesBlocks.SCORCHED_PLANKS, "redstone"); - createDoorRecipe(CinderscapesBlocks.SCORCHED_DOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createFenceRecipe(CinderscapesBlocks.SCORCHED_FENCE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createFenceGateRecipe(CinderscapesBlocks.SCORCHED_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - offerHangingSignRecipe(exporter, CinderscapesItems.SCORCHED_HANGING_SIGN, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.SCORCHED_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_STEM)) - .offerTo(exporter); - offerPlanksRecipe(exporter, CinderscapesBlocks.SCORCHED_PLANKS, CinderscapesItemTags.SCORCHED_STEMS, 4); - offerPressurePlateRecipe(exporter, CinderscapesBlocks.SCORCHED_PRESSURE_PLATE, CinderscapesBlocks.SCORCHED_PLANKS); - createSignRecipe(CinderscapesItems.SCORCHED_SIGN, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_SLAB, CinderscapesBlocks.SCORCHED_PLANKS); - createStairsRecipe(CinderscapesBlocks.SCORCHED_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - createTrapdoorRecipe(CinderscapesBlocks.SCORCHED_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) - .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.STRIPPED_SCORCHED_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_SCORCHED_STEM)) - .offerTo(exporter); + // wood recipes + offerSingleOutputShapelessRecipe(CinderscapesBlocks.SCORCHED_BUTTON, CinderscapesBlocks.SCORCHED_PLANKS, "redstone"); + createDoorRecipe(CinderscapesBlocks.SCORCHED_DOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + createFenceRecipe(CinderscapesBlocks.SCORCHED_FENCE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + createFenceGateRecipe(CinderscapesBlocks.SCORCHED_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + offerHangingSignRecipe(CinderscapesItems.SCORCHED_HANGING_SIGN, CinderscapesBlocks.STRIPPED_SCORCHED_STEM); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_HYPHAE, 3) + .group("bark") + .pattern("LL") + .pattern("LL") + .input('L', CinderscapesBlocks.SCORCHED_STEM) + .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_STEM)) + .offerTo(exporter); + offerPlanksRecipe(CinderscapesBlocks.SCORCHED_PLANKS, CinderscapesItemTags.SCORCHED_STEMS, 4); + offerPressurePlateRecipe(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE, CinderscapesBlocks.SCORCHED_PLANKS); + createSignRecipe(CinderscapesItems.SCORCHED_SIGN, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.SCORCHED_SLAB, CinderscapesBlocks.SCORCHED_PLANKS); + createStairsRecipe(CinderscapesBlocks.SCORCHED_STAIRS, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + createTrapdoorRecipe(CinderscapesBlocks.SCORCHED_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.SCORCHED_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.SCORCHED_PLANKS)) + .offerTo(exporter); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE, 3) + .group("bark") + .pattern("LL") + .pattern("LL") + .input('L', CinderscapesBlocks.STRIPPED_SCORCHED_STEM) + .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_SCORCHED_STEM)) + .offerTo(exporter); - offerSingleOutputShapelessRecipe(exporter, CinderscapesBlocks.UMBRAL_BUTTON, CinderscapesBlocks.UMBRAL_PLANKS, "redstone"); - createDoorRecipe(CinderscapesBlocks.UMBRAL_DOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createFenceRecipe(CinderscapesBlocks.UMBRAL_FENCE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createFenceGateRecipe(CinderscapesBlocks.UMBRAL_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - offerHangingSignRecipe(exporter, CinderscapesItems.UMBRAL_HANGING_SIGN, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.UMBRAL_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_STEM)) - .offerTo(exporter); - offerPlanksRecipe(exporter, CinderscapesBlocks.UMBRAL_PLANKS, CinderscapesItemTags.UMBRAL_STEMS, 4); - offerPressurePlateRecipe(exporter, CinderscapesBlocks.UMBRAL_PRESSURE_PLATE, CinderscapesBlocks.UMBRAL_PLANKS); - createSignRecipe(CinderscapesItems.UMBRAL_SIGN, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - offerSlabRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_SLAB, CinderscapesBlocks.UMBRAL_PLANKS); - createStairsRecipe(CinderscapesBlocks.UMBRAL_STAIRS, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - createTrapdoorRecipe(CinderscapesBlocks.UMBRAL_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) - .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) - .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE, 3) - .group("bark") - .pattern("LL") - .pattern("LL") - .input('L', CinderscapesBlocks.STRIPPED_UMBRAL_STEM) - .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_UMBRAL_STEM)) - .offerTo(exporter); + offerSingleOutputShapelessRecipe(CinderscapesBlocks.UMBRAL_BUTTON, CinderscapesBlocks.UMBRAL_PLANKS, "redstone"); + createDoorRecipe(CinderscapesBlocks.UMBRAL_DOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + createFenceRecipe(CinderscapesBlocks.UMBRAL_FENCE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + createFenceGateRecipe(CinderscapesBlocks.UMBRAL_FENCE_GATE, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + offerHangingSignRecipe(CinderscapesItems.UMBRAL_HANGING_SIGN, CinderscapesBlocks.STRIPPED_UMBRAL_STEM); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_HYPHAE, 3) + .group("bark") + .pattern("LL") + .pattern("LL") + .input('L', CinderscapesBlocks.UMBRAL_STEM) + .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_STEM)) + .offerTo(exporter); + offerPlanksRecipe(CinderscapesBlocks.UMBRAL_PLANKS, CinderscapesItemTags.UMBRAL_STEMS, 4); + offerPressurePlateRecipe(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE, CinderscapesBlocks.UMBRAL_PLANKS); + createSignRecipe(CinderscapesItems.UMBRAL_SIGN, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + offerSlabRecipe(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.UMBRAL_SLAB, CinderscapesBlocks.UMBRAL_PLANKS); + createStairsRecipe(CinderscapesBlocks.UMBRAL_STAIRS, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + createTrapdoorRecipe(CinderscapesBlocks.UMBRAL_TRAPDOOR, Ingredient.ofItems(CinderscapesBlocks.UMBRAL_PLANKS)) + .criterion("has_planks", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.UMBRAL_PLANKS)) + .offerTo(exporter); + createShaped(RecipeCategory.BUILDING_BLOCKS, CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE, 3) + .group("bark") + .pattern("LL") + .pattern("LL") + .input('L', CinderscapesBlocks.STRIPPED_UMBRAL_STEM) + .criterion("has_logs", InventoryChangedCriterion.Conditions.items(CinderscapesBlocks.STRIPPED_UMBRAL_STEM)) + .offerTo(exporter); + } + + // Returns an ItemPredicate matching any item in the provided ItemTag key. + private static ItemPredicate getItemTagPredicate(RegistryWrapper.WrapperLookup registryLookup, TagKey itemTagKey) { + return ItemPredicate.Builder.create().tag(registryLookup.getOrThrow(RegistryKeys.ITEM), itemTagKey).build(); + } + }; } - // Returns an ItemPredicate matching any item in the provided ItemTag key. - private static ItemPredicate getItemTagPredicate(TagKey itemTagKey) { - return ItemPredicate.Builder.create().tag(itemTagKey).build(); + @Override + public String getName() { + return "Cinderscapes Recipes"; } @Override diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/feature/AshTopLayerFeature.java b/common/src/main/java/com/terraformersmc/cinderscapes/feature/AshTopLayerFeature.java index 818785fb..db31e0ef 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/feature/AshTopLayerFeature.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/feature/AshTopLayerFeature.java @@ -29,7 +29,7 @@ public boolean generate(FeatureContext context) { StructureWorldAccess world = context.getWorld(); if (VALID_BIOMES == null) { VALID_BIOMES = new HashSet<>(); - VALID_BIOMES.add(world.getRegistryManager().get(RegistryKeys.BIOME).get(CinderscapesBiomes.ASHY_SHOALS)); + VALID_BIOMES.add(world.getRegistryManager().getOrThrow(RegistryKeys.BIOME).get(CinderscapesBiomes.ASHY_SHOALS)); // TODO: fix this or figure out better system /*world.getRegistryManager().get(Registry.BIOME_KEY).stream() .filter(biome -> biome.getGenerationSettings().isFeatureAllowed(CinderscapesPlacedFeatures.ASH_TOP_LAYER.value())) diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java index 78f66c38..ba55495f 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimMaterials.java @@ -1,8 +1,8 @@ package com.terraformersmc.cinderscapes.init; import com.terraformersmc.cinderscapes.Cinderscapes; -import net.minecraft.item.trim.ArmorTrimMaterial; -import net.minecraft.item.trim.ArmorTrimMaterials; +import net.minecraft.item.equipment.trim.ArmorTrimMaterial; +import net.minecraft.item.equipment.trim.ArmorTrimMaterials; import net.minecraft.registry.Registerable; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java index c0bc7f2d..c14cf457 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesBlocks.java @@ -201,43 +201,43 @@ public static void init() { // Ashy Shoals // ///////////////// - SCORCHED_STEM = CinderscapesRegistry.register("scorched_stem", PillarLogHelper.ofNether(MapColor.GRAY, MapColor.TERRACOTTA_GRAY)); - STRIPPED_SCORCHED_STEM = CinderscapesRegistry.register("stripped_scorched_stem", PillarLogHelper.ofNether(MapColor.GRAY)); + SCORCHED_STEM = CinderscapesRegistry.register("scorched_stem", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.GRAY, MapColor.TERRACOTTA_GRAY)); + STRIPPED_SCORCHED_STEM = CinderscapesRegistry.register("stripped_scorched_stem", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.GRAY)); - SCORCHED_HYPHAE = CinderscapesRegistry.register("scorched_hyphae", PillarLogHelper.ofNether(MapColor.TERRACOTTA_GRAY)); - STRIPPED_SCORCHED_HYPHAE = CinderscapesRegistry.register("stripped_scorched_hyphae", PillarLogHelper.ofNether(MapColor.GRAY)); + SCORCHED_HYPHAE = CinderscapesRegistry.register("scorched_hyphae", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.TERRACOTTA_GRAY)); + STRIPPED_SCORCHED_HYPHAE = CinderscapesRegistry.register("stripped_scorched_hyphae", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.GRAY)); - SCORCHED_PLANKS = CinderscapesRegistry.register("scorched_planks", new Block(AbstractBlock.Settings.copy(Blocks.CRIMSON_PLANKS).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_SLAB = CinderscapesRegistry.register("scorched_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.CRIMSON_SLAB).mapColor(MapColor.LIGHT_GRAY))); + SCORCHED_PLANKS = CinderscapesRegistry.register("scorched_planks", Block::new, AbstractBlock.Settings.copy(Blocks.CRIMSON_PLANKS).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_SLAB = CinderscapesRegistry.register("scorched_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.CRIMSON_SLAB).mapColor(MapColor.LIGHT_GRAY)); - SCORCHED_PRESSURE_PLATE = CinderscapesRegistry.register("scorched_pressure_plate", new PressurePlateBlock(BlockSetType.CRIMSON, AbstractBlock.Settings.copy(Blocks.CRIMSON_PRESSURE_PLATE).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_FENCE = CinderscapesRegistry.register("scorched_fence", new FenceBlock(AbstractBlock.Settings.copy(Blocks.CRIMSON_FENCE).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_TRAPDOOR = CinderscapesRegistry.register("scorched_trapdoor", new TrapdoorBlock(BlockSetType.CRIMSON, AbstractBlock.Settings.copy(Blocks.CRIMSON_TRAPDOOR).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_FENCE_GATE = CinderscapesRegistry.register("scorched_fence_gate", new FenceGateBlock(WoodType.CRIMSON, AbstractBlock.Settings.copy(Blocks.CRIMSON_FENCE_GATE).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_STAIRS = CinderscapesRegistry.register("scorched_stairs", new StairsBlock(SCORCHED_PLANKS.getDefaultState(), AbstractBlock.Settings.copy(Blocks.CRIMSON_STAIRS).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_BUTTON = CinderscapesRegistry.register("scorched_button", new ButtonBlock(BlockSetType.CRIMSON, 30, AbstractBlock.Settings.copy(Blocks.CRIMSON_BUTTON).mapColor(MapColor.LIGHT_GRAY))); - SCORCHED_DOOR = CinderscapesRegistry.register("scorched_door", new DoorBlock(BlockSetType.CRIMSON, AbstractBlock.Settings.copy(Blocks.CRIMSON_DOOR).mapColor(MapColor.LIGHT_GRAY))); + SCORCHED_PRESSURE_PLATE = CinderscapesRegistry.register("scorched_pressure_plate", settings -> new PressurePlateBlock(BlockSetType.CRIMSON, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_PRESSURE_PLATE).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_FENCE = CinderscapesRegistry.register("scorched_fence", FenceBlock::new, AbstractBlock.Settings.copy(Blocks.CRIMSON_FENCE).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_TRAPDOOR = CinderscapesRegistry.register("scorched_trapdoor", settings -> new TrapdoorBlock(BlockSetType.CRIMSON, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_TRAPDOOR).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_FENCE_GATE = CinderscapesRegistry.register("scorched_fence_gate", settings -> new FenceGateBlock(WoodType.CRIMSON, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_FENCE_GATE).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_STAIRS = CinderscapesRegistry.register("scorched_stairs", settings -> new StairsBlock(SCORCHED_PLANKS.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_STAIRS).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_BUTTON = CinderscapesRegistry.register("scorched_button", settings -> new ButtonBlock(BlockSetType.CRIMSON, 30, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_BUTTON).mapColor(MapColor.LIGHT_GRAY)); + SCORCHED_DOOR = CinderscapesRegistry.register("scorched_door", settings -> new DoorBlock(BlockSetType.CRIMSON, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_DOOR).mapColor(MapColor.LIGHT_GRAY)); final Identifier SCORCHED_SIGN_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "entity/signs/scorched"); - SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", new TerraformSignBlock(SCORCHED_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.CRIMSON_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD))); - SCORCHED_WALL_SIGN = CinderscapesRegistry.register("scorched_wall_sign", new TerraformWallSignBlock(SCORCHED_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.CRIMSON_WALL_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD).dropsLike(SCORCHED_SIGN))); + SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", settings -> new TerraformSignBlock(SCORCHED_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD)); + SCORCHED_WALL_SIGN = CinderscapesRegistry.register("scorched_wall_sign", settings -> new TerraformWallSignBlock(SCORCHED_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_WALL_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD).lootTable(SCORCHED_SIGN.getLootTableKey())); final Identifier SCORCHED_HANGING_SIGN_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "entity/signs/hanging/scorched"); final Identifier SCORCHED_HANGING_SIGN_GUI_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "textures/gui/hanging_signs/scorched"); - SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", new TerraformHangingSignBlock(SCORCHED_HANGING_SIGN_TEXTURE, SCORCHED_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.CRIMSON_HANGING_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN))); - SCORCHED_WALL_HANGING_SIGN = CinderscapesRegistry.register("scorched_wall_hanging_sign", new TerraformWallHangingSignBlock(SCORCHED_HANGING_SIGN_TEXTURE, SCORCHED_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.CRIMSON_WALL_HANGING_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN).dropsLike(SCORCHED_HANGING_SIGN))); + SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", settings -> new TerraformHangingSignBlock(SCORCHED_HANGING_SIGN_TEXTURE, SCORCHED_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_HANGING_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN)); + SCORCHED_WALL_HANGING_SIGN = CinderscapesRegistry.register("scorched_wall_hanging_sign", settings -> new TerraformWallHangingSignBlock(SCORCHED_HANGING_SIGN_TEXTURE, SCORCHED_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_WALL_HANGING_SIGN).mapColor(MapColor.LIGHT_GRAY).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN).lootTable(SCORCHED_HANGING_SIGN.getLootTableKey())); - SCORCHED_SHRUB = CinderscapesRegistry.register("scorched_shrub", new CinderscapesNetherPlantBlock(AbstractBlock.Settings.copy(Blocks.DEAD_BUSH).mapColor(MapColor.TERRACOTTA_GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 14.0, 14.0))); - POTTED_SCORCHED_SHRUB = CinderscapesRegistry.register("potted_scorched_shrub", new FlowerPotBlock(SCORCHED_SHRUB, AbstractBlock.Settings.copy(Blocks.POTTED_DEAD_BUSH))); + SCORCHED_SHRUB = CinderscapesRegistry.register("scorched_shrub", settings -> new CinderscapesNetherPlantBlock(state -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 14.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.DEAD_BUSH).mapColor(MapColor.TERRACOTTA_GRAY)); + POTTED_SCORCHED_SHRUB = CinderscapesRegistry.register("potted_scorched_shrub", settings -> new FlowerPotBlock(SCORCHED_SHRUB, settings), AbstractBlock.Settings.copy(Blocks.POTTED_DEAD_BUSH)); - SCORCHED_SPROUTS = CinderscapesRegistry.register("scorched_sprouts", new CinderscapesNetherPlantBlock(AbstractBlock.Settings.copy(Blocks.NETHER_SPROUTS).mapColor(MapColor.GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 3.0, 14.0))); - SCORCHED_TENDRILS = CinderscapesRegistry.register("scorched_tendrils", new CinderscapesNetherPlantBlock(AbstractBlock.Settings.copy(Blocks.CRIMSON_ROOTS).mapColor(MapColor.GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0))); - POTTED_SCORCHED_TENDRILS = CinderscapesRegistry.register("potted_scorched_tendrils", new FlowerPotBlock(SCORCHED_TENDRILS, AbstractBlock.Settings.copy(Blocks.POTTED_CRIMSON_ROOTS))); + SCORCHED_SPROUTS = CinderscapesRegistry.register("scorched_sprouts", settings -> new CinderscapesNetherPlantBlock(state -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 3.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.NETHER_SPROUTS).mapColor(MapColor.GRAY)); + SCORCHED_TENDRILS = CinderscapesRegistry.register("scorched_tendrils", settings -> new CinderscapesNetherPlantBlock(state -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.CRIMSON_ROOTS).mapColor(MapColor.GRAY)); + POTTED_SCORCHED_TENDRILS = CinderscapesRegistry.register("potted_scorched_tendrils", settings -> new FlowerPotBlock(SCORCHED_TENDRILS, settings), AbstractBlock.Settings.copy(Blocks.POTTED_CRIMSON_ROOTS)); - ASH = CinderscapesRegistry.register("ash", new AshLayerBlock(AbstractBlock.Settings.copy(Blocks.SNOW).mapColor(MapColor.GRAY))); - ASH_BLOCK = CinderscapesRegistry.register("ash_block", new Block(AbstractBlock.Settings.copy(Blocks.SNOW_BLOCK).mapColor(MapColor.GRAY))); + ASH = CinderscapesRegistry.register("ash", AshLayerBlock::new, AbstractBlock.Settings.copy(Blocks.SNOW).mapColor(MapColor.GRAY)); + ASH_BLOCK = CinderscapesRegistry.register("ash_block", Block::new, AbstractBlock.Settings.copy(Blocks.SNOW_BLOCK).mapColor(MapColor.GRAY)); - PYRACINTH = CinderscapesRegistry.register("pyracinth", new PyracinthBlock()); - POTTED_PYRACINTH = CinderscapesRegistry.register("potted_pyracinth", new PottedPyracinthBlock()); + PYRACINTH = CinderscapesRegistry.register("pyracinth", PyracinthBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.ORANGE)); + POTTED_PYRACINTH = CinderscapesRegistry.register("potted_pyracinth", PottedPyracinthBlock::new, AbstractBlock.Settings.copy(Blocks.POTTED_ALLIUM)); //////////////////// // Luminous Grove // @@ -245,126 +245,126 @@ public static void init() { // Umbral Nylia - UMBRAL_STEM = CinderscapesRegistry.register("umbral_stem", PillarLogHelper.ofNether(MapColor.LIGHT_BLUE_GRAY, MapColor.BLUE)); - STRIPPED_UMBRAL_STEM = CinderscapesRegistry.register("stripped_umbral_stem", PillarLogHelper.ofNether(MapColor.LIGHT_BLUE_GRAY)); + UMBRAL_STEM = CinderscapesRegistry.register("umbral_stem", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.LIGHT_BLUE_GRAY, MapColor.BLUE)); + STRIPPED_UMBRAL_STEM = CinderscapesRegistry.register("stripped_umbral_stem", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.LIGHT_BLUE_GRAY)); - UMBRAL_HYPHAE = CinderscapesRegistry.register("umbral_hyphae", PillarLogHelper.ofNether(MapColor.BLUE)); - STRIPPED_UMBRAL_HYPHAE = CinderscapesRegistry.register("stripped_umbral_hyphae", PillarLogHelper.ofNether(MapColor.LIGHT_BLUE_GRAY)); + UMBRAL_HYPHAE = CinderscapesRegistry.register("umbral_hyphae", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.BLUE)); + STRIPPED_UMBRAL_HYPHAE = CinderscapesRegistry.register("stripped_umbral_hyphae", PillarBlock::new, PillarLogHelper.createNetherSettings(MapColor.LIGHT_BLUE_GRAY)); - UMBRAL_NYLIUM = CinderscapesRegistry.register("umbral_nylium", new CinderscapesNyliumBlock(AbstractBlock.Settings.copy(Blocks.WARPED_NYLIUM).mapColor(MapColor.LIGHT_BLUE_GRAY))); + UMBRAL_NYLIUM = CinderscapesRegistry.register("umbral_nylium", CinderscapesNyliumBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_NYLIUM).mapColor(MapColor.LIGHT_BLUE_GRAY)); - UMBRAL_FUNGUS = CinderscapesRegistry.register("umbral_fungus", new FungusBlock(CinderscapesConfiguredFeatures.CANOPIED_HUGE_FUNGUS_PLANTED, UMBRAL_NYLIUM, AbstractBlock.Settings.copy(Blocks.WARPED_FUNGUS).mapColor(MapColor.BLUE).luminance(state -> 15))); - POTTED_UMBRAL_FUNGUS = CinderscapesRegistry.register("potted_umbral_fungus", new FlowerPotBlock(UMBRAL_FUNGUS, AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_FUNGUS))); + UMBRAL_FUNGUS = CinderscapesRegistry.register("umbral_fungus", settings -> new FungusBlock(CinderscapesConfiguredFeatures.CANOPIED_HUGE_FUNGUS_PLANTED, UMBRAL_NYLIUM, settings), AbstractBlock.Settings.copy(Blocks.WARPED_FUNGUS).mapColor(MapColor.BLUE).luminance(state -> 15)); + POTTED_UMBRAL_FUNGUS = CinderscapesRegistry.register("potted_umbral_fungus", settings -> new FlowerPotBlock(UMBRAL_FUNGUS, settings), AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_FUNGUS).luminance(state -> 12)); - UMBRAL_WART_BLOCK = CinderscapesRegistry.register("umbral_wart_block", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(Blocks.WARPED_WART_BLOCK).mapColor(MapColor.BLUE).nonOpaque())); - UMBRAL_FLESH_BLOCK = CinderscapesRegistry.register("umbral_flesh_block", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(UMBRAL_WART_BLOCK).luminance(state -> 15))); + UMBRAL_WART_BLOCK = CinderscapesRegistry.register("umbral_wart_block", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_WART_BLOCK).mapColor(MapColor.BLUE).nonOpaque()); + UMBRAL_FLESH_BLOCK = CinderscapesRegistry.register("umbral_flesh_block", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(UMBRAL_WART_BLOCK).luminance(state -> 15)); - UMBRAL_PLANKS = CinderscapesRegistry.register("umbral_planks", new Block(AbstractBlock.Settings.copy(Blocks.WARPED_PLANKS).mapColor(MapColor.BLUE))); - UMBRAL_SLAB = CinderscapesRegistry.register("umbral_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.WARPED_SLAB).mapColor(MapColor.BLUE))); - UMBRAL_PRESSURE_PLATE = CinderscapesRegistry.register("umbral_pressure_plate", new PressurePlateBlock(BlockSetType.WARPED, AbstractBlock.Settings.copy(Blocks.WARPED_PRESSURE_PLATE).mapColor(MapColor.BLUE))); - UMBRAL_FENCE = CinderscapesRegistry.register("umbral_fence", new FenceBlock(AbstractBlock.Settings.copy(Blocks.WARPED_FENCE).mapColor(MapColor.BLUE))); - UMBRAL_TRAPDOOR = CinderscapesRegistry.register("umbral_trapdoor", new TrapdoorBlock(BlockSetType.WARPED, AbstractBlock.Settings.copy(Blocks.WARPED_TRAPDOOR).mapColor(MapColor.BLUE))); - UMBRAL_FENCE_GATE = CinderscapesRegistry.register("umbral_fence_gate", new FenceGateBlock(WoodType.WARPED, AbstractBlock.Settings.copy(Blocks.WARPED_FENCE_GATE).mapColor(MapColor.BLUE))); - UMBRAL_STAIRS = CinderscapesRegistry.register("umbral_stairs", new StairsBlock(UMBRAL_PLANKS.getDefaultState(), AbstractBlock.Settings.copy(Blocks.WARPED_STAIRS).mapColor(MapColor.BLUE))); - UMBRAL_BUTTON = CinderscapesRegistry.register("umbral_button", new ButtonBlock(BlockSetType.WARPED, 30, AbstractBlock.Settings.copy(Blocks.WARPED_BUTTON).mapColor(MapColor.BLUE))); - UMBRAL_DOOR = CinderscapesRegistry.register("umbral_door", new DoorBlock(BlockSetType.WARPED, AbstractBlock.Settings.copy(Blocks.WARPED_DOOR).mapColor(MapColor.BLUE))); + UMBRAL_PLANKS = CinderscapesRegistry.register("umbral_planks", Block::new, AbstractBlock.Settings.copy(Blocks.WARPED_PLANKS).mapColor(MapColor.BLUE)); + UMBRAL_SLAB = CinderscapesRegistry.register("umbral_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_SLAB).mapColor(MapColor.BLUE)); + UMBRAL_PRESSURE_PLATE = CinderscapesRegistry.register("umbral_pressure_plate", settings -> new PressurePlateBlock(BlockSetType.WARPED, settings), AbstractBlock.Settings.copy(Blocks.WARPED_PRESSURE_PLATE).mapColor(MapColor.BLUE)); + UMBRAL_FENCE = CinderscapesRegistry.register("umbral_fence", FenceBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_FENCE).mapColor(MapColor.BLUE)); + UMBRAL_TRAPDOOR = CinderscapesRegistry.register("umbral_trapdoor", settings -> new TrapdoorBlock(BlockSetType.WARPED, settings), AbstractBlock.Settings.copy(Blocks.WARPED_TRAPDOOR).mapColor(MapColor.BLUE)); + UMBRAL_FENCE_GATE = CinderscapesRegistry.register("umbral_fence_gate", settings -> new FenceGateBlock(WoodType.WARPED, settings), AbstractBlock.Settings.copy(Blocks.WARPED_FENCE_GATE).mapColor(MapColor.BLUE)); + UMBRAL_STAIRS = CinderscapesRegistry.register("umbral_stairs", settings -> new StairsBlock(UMBRAL_PLANKS.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.WARPED_STAIRS).mapColor(MapColor.BLUE)); + UMBRAL_BUTTON = CinderscapesRegistry.register("umbral_button", settings -> new ButtonBlock(BlockSetType.WARPED, 30, settings), AbstractBlock.Settings.copy(Blocks.WARPED_BUTTON).mapColor(MapColor.BLUE)); + UMBRAL_DOOR = CinderscapesRegistry.register("umbral_door", settings -> new DoorBlock(BlockSetType.WARPED, settings), AbstractBlock.Settings.copy(Blocks.WARPED_DOOR).mapColor(MapColor.BLUE)); final Identifier UMBRAL_SIGN_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "entity/signs/umbral"); - UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", new TerraformSignBlock(UMBRAL_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.WARPED_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD))); - UMBRAL_WALL_SIGN = CinderscapesRegistry.register("umbral_wall_sign", new TerraformWallSignBlock(UMBRAL_SIGN_TEXTURE, AbstractBlock.Settings.copy(Blocks.WARPED_WALL_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD).dropsLike(UMBRAL_SIGN))); + UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", settings -> new TerraformSignBlock(UMBRAL_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.WARPED_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD)); + UMBRAL_WALL_SIGN = CinderscapesRegistry.register("umbral_wall_sign", settings -> new TerraformWallSignBlock(UMBRAL_SIGN_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.WARPED_WALL_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD).lootTable(UMBRAL_SIGN.getLootTableKey())); final Identifier UMBRAL_HANGING_SIGN_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "entity/signs/hanging/umbral"); final Identifier UMBRAL_HANGING_SIGN_GUI_TEXTURE = Identifier.of(Cinderscapes.MOD_ID, "textures/gui/hanging_signs/umbral"); - UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", new TerraformHangingSignBlock(UMBRAL_HANGING_SIGN_TEXTURE, UMBRAL_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.WARPED_HANGING_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN))); - UMBRAL_WALL_HANGING_SIGN = CinderscapesRegistry.register("umbral_wall_hanging_sign", new TerraformWallHangingSignBlock(UMBRAL_HANGING_SIGN_TEXTURE, UMBRAL_HANGING_SIGN_GUI_TEXTURE, AbstractBlock.Settings.copy(Blocks.WARPED_WALL_HANGING_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN).dropsLike(UMBRAL_HANGING_SIGN))); + UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", settings -> new TerraformHangingSignBlock(UMBRAL_HANGING_SIGN_TEXTURE, UMBRAL_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.WARPED_HANGING_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN)); + UMBRAL_WALL_HANGING_SIGN = CinderscapesRegistry.register("umbral_wall_hanging_sign", settings -> new TerraformWallHangingSignBlock(UMBRAL_HANGING_SIGN_TEXTURE, UMBRAL_HANGING_SIGN_GUI_TEXTURE, settings), AbstractBlock.Settings.copy(Blocks.WARPED_WALL_HANGING_SIGN).mapColor(MapColor.BLUE).sounds(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN).lootTable(UMBRAL_HANGING_SIGN.getLootTableKey())); // Other - TWILIGHT_VINE_BLOCK = CinderscapesRegistry.register("twilight_vine_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.DARK_AQUA).instrument(NoteBlockInstrument.BASS).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM))); - TWILIGHT_TENDRILS = CinderscapesRegistry.register("twilight_tendrils", new CinderscapesNetherPlantBlock(AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_PURPLE).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0))); - POTTED_TWILIGHT_TENDRILS = CinderscapesRegistry.register("potted_twilight_tendrils", new FlowerPotBlock(TWILIGHT_TENDRILS, AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_ROOTS).luminance((state) -> 15))); - TWILIGHT_FESCUES = CinderscapesRegistry.register("twilight_fescues", new CinderscapesNetherPlantBlock(AbstractBlock.Settings.copy(Blocks.NETHER_SPROUTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 5.0, 14.0))); + TWILIGHT_VINE_BLOCK = CinderscapesRegistry.register("twilight_vine_block", Block::new, AbstractBlock.Settings.create().mapColor(MapColor.DARK_AQUA).instrument(NoteBlockInstrument.BASS).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM)); + TWILIGHT_TENDRILS = CinderscapesRegistry.register("twilight_tendrils", settings -> new CinderscapesNetherPlantBlock(state -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_PURPLE).luminance(state -> 15)); + POTTED_TWILIGHT_TENDRILS = CinderscapesRegistry.register("potted_twilight_tendrils", settings -> new FlowerPotBlock(TWILIGHT_TENDRILS, settings), AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_ROOTS).luminance(state -> 12)); + TWILIGHT_FESCUES = CinderscapesRegistry.register("twilight_fescues", settings -> new CinderscapesNetherPlantBlock(state -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 5.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.NETHER_SPROUTS).mapColor(MapColor.PURPLE)); - PHOTOFERN = CinderscapesRegistry.register("photofern", new PhotofernBlock()); - POTTED_PHOTOFERN = CinderscapesRegistry.register("potted_photofern", new FlowerPotBlock(PHOTOFERN, AbstractBlock.Settings.copy(Blocks.POTTED_FERN))); + PHOTOFERN = CinderscapesRegistry.register("photofern", PhotofernBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE)); + POTTED_PHOTOFERN = CinderscapesRegistry.register("potted_photofern", settings -> new FlowerPotBlock(PHOTOFERN, settings), AbstractBlock.Settings.copy(Blocks.POTTED_FERN)); - TALL_PHOTOFERN = CinderscapesRegistry.register("tall_photofern", new CinderscapesNetherTallPlantBlock(AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0))); + TALL_PHOTOFERN = CinderscapesRegistry.register("tall_photofern", settings -> new CinderscapesNetherTallPlantBlock(state -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE)); - LUMINOUS_POD = CinderscapesRegistry.register("luminous_pod", new CinderscapesNetherTallPlantBlock(AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_GREEN).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0))); - POTTED_LUMINOUS_POD = CinderscapesRegistry.register("potted_luminous_pod", new FlowerPotBlock(LUMINOUS_POD, AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_ROOTS).luminance((state) -> 15))); - GHASTLY_ECTOPLASM = CinderscapesRegistry.register("ghastly_ectoplasm", new GhastlyEctoplasmBlock(AbstractBlock.Settings.copy(Blocks.WEEPING_VINES_PLANT).mapColor(MapColor.OFF_WHITE).sounds(BlockSoundGroup.ROOTS))); + LUMINOUS_POD = CinderscapesRegistry.register("luminous_pod", settings -> new CinderscapesNetherTallPlantBlock(state -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0), settings), AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_GREEN).luminance(state -> 15)); + POTTED_LUMINOUS_POD = CinderscapesRegistry.register("potted_luminous_pod", settings -> new FlowerPotBlock(LUMINOUS_POD, settings), AbstractBlock.Settings.copy(Blocks.POTTED_WARPED_ROOTS).luminance(state -> 12)); + GHASTLY_ECTOPLASM = CinderscapesRegistry.register("ghastly_ectoplasm", GhastlyEctoplasmBlock::new, AbstractBlock.Settings.copy(Blocks.WEEPING_VINES_PLANT).mapColor(MapColor.OFF_WHITE).sounds(BlockSoundGroup.ROOTS)); /////////// // Other // /////////// - BRAMBLE_BERRY_BUSH = CinderscapesRegistry.register("bramble_berry_bush", new BrambleBerryBushBlock(AbstractBlock.Settings.copy(Blocks.SWEET_BERRY_BUSH).mapColor(MapColor.TERRACOTTA_BLACK))); + BRAMBLE_BERRY_BUSH = CinderscapesRegistry.register("bramble_berry_bush", BrambleBerryBushBlock::new, AbstractBlock.Settings.copy(Blocks.SWEET_BERRY_BUSH).mapColor(MapColor.TERRACOTTA_BLACK)); - NODZOL = CinderscapesRegistry.register("nodzol", new Block(AbstractBlock.Settings.copy(Blocks.NETHERRACK).mapColor(MapColor.BROWN))); + NODZOL = CinderscapesRegistry.register("nodzol", Block::new, AbstractBlock.Settings.copy(Blocks.NETHERRACK).mapColor(MapColor.BROWN)); - SULFUR_BLOCK = CinderscapesRegistry.register("sulfur_block", new Block(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).instrument(NoteBlockInstrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL))); - SULFUR_ORE = CinderscapesRegistry.register("sulfur_ore", new CinderscapesOreBlock(AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); + SULFUR_BLOCK = CinderscapesRegistry.register("sulfur_block", Block::new, AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).instrument(NoteBlockInstrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL)); + SULFUR_ORE = CinderscapesRegistry.register("sulfur_ore", CinderscapesOreBlock::new, AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.NETHER_ORE).requiresTool()); /////////////////// // Quartz Cavern // /////////////////// - CRYSTINIUM = CinderscapesRegistry.register("crystinium", new CrystiniumBlock()); - POTTED_CRYSTINIUM = CinderscapesRegistry.register("potted_crystinium", new PottedCrystiniumBlock()); + CRYSTINIUM = CinderscapesRegistry.register("crystinium", CrystiniumBlock::new, AbstractBlock.Settings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.YELLOW)); + POTTED_CRYSTINIUM = CinderscapesRegistry.register("potted_crystinium", PottedCrystiniumBlock::new, AbstractBlock.Settings.copy(Blocks.POTTED_ALLIUM)); - CRYSTALLINE_QUARTZ = CinderscapesRegistry.register("crystalline_quartz", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).sounds(BlockSoundGroup.GLASS).nonOpaque().allowsSpawning(CinderscapesBlocks::never).solidBlock(CinderscapesBlocks::never).suffocates(CinderscapesBlocks::never).blockVision(CinderscapesBlocks::never))); - POLYPITE_QUARTZ = CinderscapesRegistry.register("polypite_quartz", new PolypiteQuartzBlock(AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ))); - POTTED_POLYPITE_QUARTZ = CinderscapesRegistry.register("potted_polypite_quartz", new FlowerPotBlock(POLYPITE_QUARTZ, AbstractBlock.Settings.copy(Blocks.FLOWER_POT))); + CRYSTALLINE_QUARTZ = CinderscapesRegistry.register("crystalline_quartz", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).sounds(BlockSoundGroup.GLASS).nonOpaque().allowsSpawning(CinderscapesBlocks::never).solidBlock(CinderscapesBlocks::never).suffocates(CinderscapesBlocks::never).blockVision(CinderscapesBlocks::never)); + POLYPITE_QUARTZ = CinderscapesRegistry.register("polypite_quartz", PolypiteQuartzBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ)); + POTTED_POLYPITE_QUARTZ = CinderscapesRegistry.register("potted_polypite_quartz", settings -> new FlowerPotBlock(POLYPITE_QUARTZ, settings), AbstractBlock.Settings.copy(Blocks.FLOWER_POT)); // Sulfur Quartz - SULFUR_QUARTZ_ORE = CinderscapesRegistry.register("sulfur_quartz_ore", new CinderscapesOreBlock(AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - SULFUR_QUARTZ_BLOCK = CinderscapesRegistry.register("sulfur_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW))); - CHISELED_SULFUR_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_sulfur_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW))); - SULFUR_QUARTZ_PILLAR = CinderscapesRegistry.register("sulfur_quartz_pillar", new PillarBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.YELLOW))); - SULFUR_QUARTZ_STAIRS = CinderscapesRegistry.register("sulfur_quartz_stairs", new StairsBlock(SULFUR_QUARTZ_BLOCK.getDefaultState(), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.YELLOW))); - SULFUR_QUARTZ_SLAB = CinderscapesRegistry.register("sulfur_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.YELLOW))); - SMOOTH_SULFUR_QUARTZ = CinderscapesRegistry.register("smooth_sulfur_quartz", new Block(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.YELLOW))); - SMOOTH_SULFUR_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_sulfur_quartz_stairs", new StairsBlock(SMOOTH_SULFUR_QUARTZ.getDefaultState(), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.YELLOW))); - SMOOTH_SULFUR_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_sulfur_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.YELLOW))); - SULFUR_QUARTZ_BRICKS = CinderscapesRegistry.register("sulfur_quartz_bricks", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.YELLOW))); - - CRYSTALLINE_SULFUR_QUARTZ = CinderscapesRegistry.register("crystalline_sulfur_quartz", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.YELLOW))); - POLYPITE_SULFUR_QUARTZ = CinderscapesRegistry.register("polypite_sulfur_quartz", new PolypiteQuartzBlock(AbstractBlock.Settings.copy(CRYSTALLINE_SULFUR_QUARTZ))); - POTTED_POLYPITE_SULFUR_QUARTZ = CinderscapesRegistry.register("potted_polypite_sulfur_quartz", new FlowerPotBlock(POLYPITE_SULFUR_QUARTZ, AbstractBlock.Settings.copy(Blocks.FLOWER_POT))); + SULFUR_QUARTZ_ORE = CinderscapesRegistry.register("sulfur_quartz_ore", CinderscapesOreBlock::new, AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.YELLOW).sounds(BlockSoundGroup.NETHER_ORE).requiresTool()); + SULFUR_QUARTZ_BLOCK = CinderscapesRegistry.register("sulfur_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW)); + CHISELED_SULFUR_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_sulfur_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW)); + SULFUR_QUARTZ_PILLAR = CinderscapesRegistry.register("sulfur_quartz_pillar", PillarBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.YELLOW)); + SULFUR_QUARTZ_STAIRS = CinderscapesRegistry.register("sulfur_quartz_stairs", settings -> new StairsBlock(SULFUR_QUARTZ_BLOCK.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.YELLOW)); + SULFUR_QUARTZ_SLAB = CinderscapesRegistry.register("sulfur_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.YELLOW)); + SMOOTH_SULFUR_QUARTZ = CinderscapesRegistry.register("smooth_sulfur_quartz", Block::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.YELLOW)); + SMOOTH_SULFUR_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_sulfur_quartz_stairs", settings -> new StairsBlock(SMOOTH_SULFUR_QUARTZ.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.YELLOW)); + SMOOTH_SULFUR_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_sulfur_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.YELLOW)); + SULFUR_QUARTZ_BRICKS = CinderscapesRegistry.register("sulfur_quartz_bricks", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.YELLOW)); + + CRYSTALLINE_SULFUR_QUARTZ = CinderscapesRegistry.register("crystalline_sulfur_quartz", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.YELLOW)); + POLYPITE_SULFUR_QUARTZ = CinderscapesRegistry.register("polypite_sulfur_quartz", PolypiteQuartzBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_SULFUR_QUARTZ)); + POTTED_POLYPITE_SULFUR_QUARTZ = CinderscapesRegistry.register("potted_polypite_sulfur_quartz", settings -> new FlowerPotBlock(POLYPITE_SULFUR_QUARTZ, settings), AbstractBlock.Settings.copy(Blocks.FLOWER_POT)); // Rose Quartz - ROSE_QUARTZ_ORE = CinderscapesRegistry.register("rose_quartz_ore", new CinderscapesOreBlock(AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.PINK).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - ROSE_QUARTZ_BLOCK = CinderscapesRegistry.register("rose_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK))); - CHISELED_ROSE_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_rose_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK))); - ROSE_QUARTZ_PILLAR = CinderscapesRegistry.register("rose_quartz_pillar", new PillarBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.PINK))); - ROSE_QUARTZ_STAIRS = CinderscapesRegistry.register("rose_quartz_stairs", new StairsBlock(ROSE_QUARTZ_BLOCK.getDefaultState(), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.PINK))); - ROSE_QUARTZ_SLAB = CinderscapesRegistry.register("rose_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.PINK))); - SMOOTH_ROSE_QUARTZ = CinderscapesRegistry.register("smooth_rose_quartz", new Block(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.PINK))); - SMOOTH_ROSE_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_rose_quartz_stairs", new StairsBlock(SMOOTH_ROSE_QUARTZ.getDefaultState(), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.PINK))); - SMOOTH_ROSE_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_rose_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.PINK))); - ROSE_QUARTZ_BRICKS = CinderscapesRegistry.register("rose_quartz_bricks", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.PINK))); - - CRYSTALLINE_ROSE_QUARTZ = CinderscapesRegistry.register("crystalline_rose_quartz", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.PINK))); - POLYPITE_ROSE_QUARTZ = CinderscapesRegistry.register("polypite_rose_quartz", new PolypiteQuartzBlock(AbstractBlock.Settings.copy(CRYSTALLINE_ROSE_QUARTZ))); - POTTED_POLYPITE_ROSE_QUARTZ = CinderscapesRegistry.register("potted_polypite_rose_quartz", new FlowerPotBlock(POLYPITE_ROSE_QUARTZ, AbstractBlock.Settings.copy(Blocks.FLOWER_POT))); + ROSE_QUARTZ_ORE = CinderscapesRegistry.register("rose_quartz_ore", CinderscapesOreBlock::new, AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.PINK).sounds(BlockSoundGroup.NETHER_ORE).requiresTool()); + ROSE_QUARTZ_BLOCK = CinderscapesRegistry.register("rose_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK)); + CHISELED_ROSE_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_rose_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK)); + ROSE_QUARTZ_PILLAR = CinderscapesRegistry.register("rose_quartz_pillar", PillarBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.PINK)); + ROSE_QUARTZ_STAIRS = CinderscapesRegistry.register("rose_quartz_stairs", settings -> new StairsBlock(ROSE_QUARTZ_BLOCK.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.PINK)); + ROSE_QUARTZ_SLAB = CinderscapesRegistry.register("rose_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.PINK)); + SMOOTH_ROSE_QUARTZ = CinderscapesRegistry.register("smooth_rose_quartz", Block::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.PINK)); + SMOOTH_ROSE_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_rose_quartz_stairs", settings -> new StairsBlock(SMOOTH_ROSE_QUARTZ.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.PINK)); + SMOOTH_ROSE_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_rose_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.PINK)); + ROSE_QUARTZ_BRICKS = CinderscapesRegistry.register("rose_quartz_bricks", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.PINK)); + + CRYSTALLINE_ROSE_QUARTZ = CinderscapesRegistry.register("crystalline_rose_quartz", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.PINK)); + POLYPITE_ROSE_QUARTZ = CinderscapesRegistry.register("polypite_rose_quartz", PolypiteQuartzBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_ROSE_QUARTZ)); + POTTED_POLYPITE_ROSE_QUARTZ = CinderscapesRegistry.register("potted_polypite_rose_quartz", settings -> new FlowerPotBlock(POLYPITE_ROSE_QUARTZ, settings), AbstractBlock.Settings.copy(Blocks.FLOWER_POT)); // Smoky Quartz - SMOKY_QUARTZ_ORE = CinderscapesRegistry.register("smoky_quartz_ore", new CinderscapesOreBlock(AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.GRAY).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - SMOKY_QUARTZ_BLOCK = CinderscapesRegistry.register("smoky_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY))); - CHISELED_SMOKY_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_smoky_quartz_block", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY))); - SMOKY_QUARTZ_PILLAR = CinderscapesRegistry.register("smoky_quartz_pillar", new PillarBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.GRAY))); - SMOKY_QUARTZ_STAIRS = CinderscapesRegistry.register("smoky_quartz_stairs", new StairsBlock(SMOKY_QUARTZ_BLOCK.getDefaultState(), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.GRAY))); - SMOKY_QUARTZ_SLAB = CinderscapesRegistry.register("smoky_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.GRAY))); - SMOOTH_SMOKY_QUARTZ = CinderscapesRegistry.register("smooth_smoky_quartz", new Block(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.GRAY))); - SMOOTH_SMOKY_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_smoky_quartz_stairs", new StairsBlock(SMOOTH_SMOKY_QUARTZ.getDefaultState(), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.GRAY))); - SMOOTH_SMOKY_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_smoky_quartz_slab", new SlabBlock(AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.GRAY))); - SMOKY_QUARTZ_BRICKS = CinderscapesRegistry.register("smoky_quartz_bricks", new Block(AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.GRAY))); - - CRYSTALLINE_SMOKY_QUARTZ = CinderscapesRegistry.register("crystalline_smoky_quartz", new CinderscapesTransparentBlock(AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.GRAY))); - POLYPITE_SMOKY_QUARTZ = CinderscapesRegistry.register("polypite_smoky_quartz", new PolypiteQuartzBlock(AbstractBlock.Settings.copy(CRYSTALLINE_SMOKY_QUARTZ))); - POTTED_POLYPITE_SMOKY_QUARTZ = CinderscapesRegistry.register("potted_polypite_smoky_quartz", new FlowerPotBlock(POLYPITE_SMOKY_QUARTZ, AbstractBlock.Settings.copy(Blocks.FLOWER_POT))); + SMOKY_QUARTZ_ORE = CinderscapesRegistry.register("smoky_quartz_ore", CinderscapesOreBlock::new, AbstractBlock.Settings.copy(Blocks.NETHER_QUARTZ_ORE).mapColor(MapColor.GRAY).sounds(BlockSoundGroup.NETHER_ORE).requiresTool()); + SMOKY_QUARTZ_BLOCK = CinderscapesRegistry.register("smoky_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY)); + CHISELED_SMOKY_QUARTZ_BLOCK = CinderscapesRegistry.register("chiseled_smoky_quartz_block", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY)); + SMOKY_QUARTZ_PILLAR = CinderscapesRegistry.register("smoky_quartz_pillar", PillarBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_PILLAR).mapColor(MapColor.GRAY)); + SMOKY_QUARTZ_STAIRS = CinderscapesRegistry.register("smoky_quartz_stairs", settings -> new StairsBlock(SMOKY_QUARTZ_BLOCK.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.QUARTZ_STAIRS).mapColor(MapColor.GRAY)); + SMOKY_QUARTZ_SLAB = CinderscapesRegistry.register("smoky_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_SLAB).mapColor(MapColor.GRAY)); + SMOOTH_SMOKY_QUARTZ = CinderscapesRegistry.register("smooth_smoky_quartz", Block::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ).mapColor(MapColor.GRAY)); + SMOOTH_SMOKY_QUARTZ_STAIRS = CinderscapesRegistry.register("smooth_smoky_quartz_stairs", settings -> new StairsBlock(SMOOTH_SMOKY_QUARTZ.getDefaultState(), settings), AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.GRAY)); + SMOOTH_SMOKY_QUARTZ_SLAB = CinderscapesRegistry.register("smooth_smoky_quartz_slab", SlabBlock::new, AbstractBlock.Settings.copy(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.GRAY)); + SMOKY_QUARTZ_BRICKS = CinderscapesRegistry.register("smoky_quartz_bricks", Block::new, AbstractBlock.Settings.copy(Blocks.QUARTZ_BRICKS).mapColor(MapColor.GRAY)); + + CRYSTALLINE_SMOKY_QUARTZ = CinderscapesRegistry.register("crystalline_smoky_quartz", CinderscapesTransparentBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_QUARTZ).mapColor(MapColor.GRAY)); + POLYPITE_SMOKY_QUARTZ = CinderscapesRegistry.register("polypite_smoky_quartz", PolypiteQuartzBlock::new, AbstractBlock.Settings.copy(CRYSTALLINE_SMOKY_QUARTZ)); + POTTED_POLYPITE_SMOKY_QUARTZ = CinderscapesRegistry.register("potted_polypite_smoky_quartz", settings -> new FlowerPotBlock(POLYPITE_SMOKY_QUARTZ, settings), AbstractBlock.Settings.copy(Blocks.FLOWER_POT)); addStrippables(); } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java index 53e09363..7b9effe0 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java @@ -2,10 +2,12 @@ import com.terraformersmc.cinderscapes.init.helpers.CinderscapesRegistry; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; +import net.minecraft.component.type.ConsumableComponents; import net.minecraft.component.type.FoodComponent; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.*; +import net.minecraft.item.consume.ApplyEffectsConsumeEffect; public class CinderscapesItems { @@ -184,8 +186,8 @@ public static void init() { SCORCHED_BUTTON = CinderscapesRegistry.registerBlockItem("scorched_button", CinderscapesBlocks.SCORCHED_BUTTON); SCORCHED_DOOR = CinderscapesRegistry.registerBlockItem("scorched_door", CinderscapesBlocks.SCORCHED_DOOR); - SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", new SignItem(new Item.Settings().maxCount(16), CinderscapesBlocks.SCORCHED_SIGN, CinderscapesBlocks.SCORCHED_WALL_SIGN)); - SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", new HangingSignItem(CinderscapesBlocks.SCORCHED_HANGING_SIGN, CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN, new Item.Settings().maxCount(16))); + SCORCHED_SIGN = CinderscapesRegistry.register("scorched_sign", settings -> new SignItem(CinderscapesBlocks.SCORCHED_SIGN, CinderscapesBlocks.SCORCHED_WALL_SIGN, settings), new Item.Settings().maxCount(16)); + SCORCHED_HANGING_SIGN = CinderscapesRegistry.register("scorched_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.SCORCHED_HANGING_SIGN, CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16)); SCORCHED_SHRUB = CinderscapesRegistry.registerBlockItem("scorched_shrub", CinderscapesBlocks.SCORCHED_SHRUB); SCORCHED_SPROUTS = CinderscapesRegistry.registerBlockItem("scorched_sprouts", CinderscapesBlocks.SCORCHED_SPROUTS); @@ -225,8 +227,8 @@ public static void init() { UMBRAL_BUTTON = CinderscapesRegistry.registerBlockItem("umbral_button", CinderscapesBlocks.UMBRAL_BUTTON); UMBRAL_DOOR = CinderscapesRegistry.registerBlockItem("umbral_door", CinderscapesBlocks.UMBRAL_DOOR); - UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", new SignItem(new Item.Settings().maxCount(16), CinderscapesBlocks.UMBRAL_SIGN, CinderscapesBlocks.UMBRAL_WALL_SIGN)); - UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", new HangingSignItem(CinderscapesBlocks.UMBRAL_HANGING_SIGN, CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN, new Item.Settings().maxCount(16))); + UMBRAL_SIGN = CinderscapesRegistry.register("umbral_sign", settings -> new SignItem(CinderscapesBlocks.UMBRAL_SIGN, CinderscapesBlocks.UMBRAL_WALL_SIGN, settings), new Item.Settings().maxCount(16)); + UMBRAL_HANGING_SIGN = CinderscapesRegistry.register("umbral_hanging_sign", settings -> new HangingSignItem(CinderscapesBlocks.UMBRAL_HANGING_SIGN, CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN, settings), new Item.Settings().maxCount(16)); // Other @@ -243,20 +245,20 @@ public static void init() { // Other // /////////// - ASH_PILE = CinderscapesRegistry.register("ash_pile", new Item(new Item.Settings())); + ASH_PILE = CinderscapesRegistry.register("ash_pile", Item::new, new Item.Settings()); - BRAMBLE_BERRIES = CinderscapesRegistry.register("bramble_berries", new AliasedBlockItem(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().nutrition(2).saturationModifier(0.1F).alwaysEdible().snack().statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 600, 0), 0.8F).build()))); + BRAMBLE_BERRIES = CinderscapesRegistry.register("bramble_berries", settings -> new BlockItem(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, settings.useItemPrefixedTranslationKey()), new Item.Settings().food(new FoodComponent.Builder().nutrition(2).saturationModifier(0.1F).alwaysEdible().build(), ConsumableComponents.food().consumeEffect(new ApplyEffectsConsumeEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 600, 0), 0.8F)).build())); NODZOL = CinderscapesRegistry.registerBlockItem("nodzol", CinderscapesBlocks.NODZOL); - SULFUR = CinderscapesRegistry.register("sulfur", new Item(new Item.Settings())); + SULFUR = CinderscapesRegistry.register("sulfur", Item::new, new Item.Settings()); SULFUR_BLOCK = CinderscapesRegistry.registerBlockItem("sulfur_block", CinderscapesBlocks.SULFUR_BLOCK); SULFUR_ORE = CinderscapesRegistry.registerBlockItem("sulfur_ore", CinderscapesBlocks.SULFUR_ORE); - ROSE_QUARTZ = CinderscapesRegistry.register("rose_quartz", new Item(new Item.Settings())); - SMOKY_QUARTZ = CinderscapesRegistry.register("smoky_quartz", new Item(new Item.Settings())); - SULFUR_QUARTZ = CinderscapesRegistry.register("sulfur_quartz", new Item(new Item.Settings())); + ROSE_QUARTZ = CinderscapesRegistry.register("rose_quartz", Item::new, new Item.Settings()); + SMOKY_QUARTZ = CinderscapesRegistry.register("smoky_quartz", Item::new, new Item.Settings()); + SULFUR_QUARTZ = CinderscapesRegistry.register("sulfur_quartz", Item::new, new Item.Settings()); /////////////////// // Quartz Cavern // diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesSoundEvents.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesSoundEvents.java index f50945be..072dd58e 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesSoundEvents.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesSoundEvents.java @@ -12,20 +12,23 @@ public class CinderscapesSoundEvents { // Acts as a kind of local registry for sound events added by Cinderscapes private static final Map SOUND_EVENTS = new LinkedHashMap<>(); - public static final SoundEvent ASHY_SHOALS_MUSIC = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music.nether.ashy_shoals"))); - public static final SoundEvent BLACKSTONE_SHALES_MUSIC = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music.nether.blackstone_shales"))); - public static final SoundEvent LUMINOUS_GROVE_MUSIC = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music.nether.luminous_grove"))); - public static final SoundEvent QUARTZ_CAVERN_MUSIC = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music.nether.quartz_cavern"))); + public static final SoundEvent ASHY_SHOALS_MUSIC = add("music.nether.ashy_shoals"); + public static final SoundEvent BLACKSTONE_SHALES_MUSIC = add("music.nether.blackstone_shales"); + public static final SoundEvent LUMINOUS_GROVE_MUSIC = add("music.nether.luminous_grove"); + public static final SoundEvent QUARTZ_CAVERN_MUSIC = add("music.nether.quartz_cavern"); - public static final SoundEvent MENU_MUSIC = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music.menu"))); + public static final SoundEvent MENU_MUSIC = add("music.menu"); - public static final SoundEvent MUSIC_DISC_LUMINOUS_PLANTATION = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music_disc.luminous_plantation"))); - public static final SoundEvent MUSIC_DISC_CHILLING_IN_HELL = add(SoundEvent.of(Identifier.of(Cinderscapes.MOD_ID, "music_disc.chilling_in_hell"))); + public static final SoundEvent MUSIC_DISC_LUMINOUS_PLANTATION = add("music_disc.luminous_plantation"); + public static final SoundEvent MUSIC_DISC_CHILLING_IN_HELL = add("music_disc.chilling_in_hell"); - private static S add(S sound_event) { - SOUND_EVENTS.put(sound_event.getId(), sound_event); + private static SoundEvent add(String path) { + Identifier id = Identifier.of(Cinderscapes.MOD_ID, path); + SoundEvent event = SoundEvent.of(id); - return sound_event; + SOUND_EVENTS.put(id, event); + + return event; } public static void init() { diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java b/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java index f7f336d7..96eb8ae7 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/init/helpers/CinderscapesRegistry.java @@ -1,6 +1,7 @@ package com.terraformersmc.cinderscapes.init.helpers; import com.terraformersmc.cinderscapes.Cinderscapes; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -10,10 +11,11 @@ import net.minecraft.world.gen.placementmodifier.PlacementModifier; import java.util.List; +import java.util.function.Function; public class CinderscapesRegistry { @SuppressWarnings("UnnecessaryReturnStatement") - public CinderscapesRegistry() { + private CinderscapesRegistry() { return; } @@ -29,33 +31,41 @@ public CinderscapesRegistry() { * @return Newly created {@link BlockItem} */ public static BlockItem registerBlockItem(String name, Block block) { - BlockItem item = new BlockItem(block, new Item.Settings()); - return register(name, item); + return register(name, settings -> new BlockItem(block, settings), new Item.Settings()); } /** * Registers an item. * * @param name Name ({@link Identifier} path string) of the item - * @param item {@link Item} to be registered + * @param factory Factory function to create {@link Item} from settings + * @param settings {@link Item.Settings} of the item * @return Newly registered {@link Item} */ - public static I register(String name, I item) { + public static I register(String name, Function factory, Item.Settings settings) { + RegistryKey key = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(Cinderscapes.MOD_ID, name)); + I item = factory.apply(settings.registryKey(key)); + if (item instanceof BlockItem blockItem) { blockItem.appendBlocks(Item.BLOCK_ITEMS, blockItem); } - return Registry.register(Registries.ITEM, Identifier.of(Cinderscapes.MOD_ID, name), item); + + return Registry.register(Registries.ITEM, key, item); } /** * Registers a block. * * @param name Name ({@link Identifier} path string) of the block - * @param block {@link Block} to be registered + * @param factory Factory function to create {@link Block} from settings + * @param settings {@link AbstractBlock.Settings} of the block * @return Newly registered {@link Block} */ - public static B register(String name, B block) { - return Registry.register(Registries.BLOCK, Identifier.of(Cinderscapes.MOD_ID, name), block); + public static B register(String name, Function factory, AbstractBlock.Settings settings) { + RegistryKey key = RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(Cinderscapes.MOD_ID, name)); + B block = factory.apply(settings.registryKey(key)); + + return Registry.register(Registries.BLOCK, key, block); } /* diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/mixin/MixinServerWorld.java b/common/src/main/java/com/terraformersmc/cinderscapes/mixin/MixinServerWorld.java index e38ccb6a..50d57e12 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/mixin/MixinServerWorld.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/mixin/MixinServerWorld.java @@ -15,7 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkSectionPos; import net.minecraft.util.math.random.RandomSequencesState; -import net.minecraft.util.profiler.Profiler; import net.minecraft.world.MutableWorldProperties; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -36,20 +35,19 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.function.Predicate; -import java.util.function.Supplier; @Mixin(ServerWorld.class) public abstract class MixinServerWorld extends World { @Unique private static Predicate> ASHY_SHOALS_PREDICATE; - protected MixinServerWorld(MutableWorldProperties properties, RegistryKey registryRef, DynamicRegistryManager registryManager, RegistryEntry dimensionEntry, Supplier profiler, boolean isClient, boolean debugWorld, long biomeAccess, int maxChainedNeighborUpdates) { - super(properties, registryRef, registryManager, dimensionEntry, profiler, isClient, debugWorld, biomeAccess, maxChainedNeighborUpdates); + protected MixinServerWorld(MutableWorldProperties properties, RegistryKey registryRef, DynamicRegistryManager registryManager, RegistryEntry dimensionEntry, boolean isClient, boolean debugWorld, long biomeAccess, int maxChainedNeighborUpdates) { + super(properties, registryRef, registryManager, dimensionEntry, isClient, debugWorld, biomeAccess, maxChainedNeighborUpdates); } @Inject(method = "", at = @At("TAIL")) private void cinderscapes$cacheAshyShoalsEntry(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState, CallbackInfo ci) { - ASHY_SHOALS_PREDICATE = Predicate.isEqual(getRegistryManager().get(RegistryKeys.BIOME).entryOf(CinderscapesBiomes.ASHY_SHOALS)); + ASHY_SHOALS_PREDICATE = Predicate.isEqual(getRegistryManager().getOrThrow(RegistryKeys.BIOME).getOptional(CinderscapesBiomes.ASHY_SHOALS).orElseThrow()); } /* diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java index a6c6f079..e3b07865 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java @@ -12,7 +12,7 @@ public class CinderscapesBlockTags { public static final TagKey UMBRAL_STEMS = CinderscapesBlockTags.of("umbral_stems"); public static final TagKey STRIPPED_LOGS = CinderscapesBlockTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOOD = CinderscapesBlockTags.of(Identifier.of("c", "stripped_wood")); + public static final TagKey STRIPPED_WOODS = CinderscapesBlockTags.of(Identifier.of("c", "stripped_woods")); @SuppressWarnings("UnnecessaryReturnStatement") private CinderscapesBlockTags() { diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java index c861c529..113e20d5 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java @@ -18,7 +18,7 @@ public class CinderscapesItemTags { public static final TagKey QUARTZ_BLOCKS = CinderscapesItemTags.of(Identifier.of("c", "quartz_blocks")); public static final TagKey STORAGE_BLOCKS_SULFUR = CinderscapesItemTags.of(Identifier.of("c", "storage_blocks/sulfur")); public static final TagKey STRIPPED_LOGS = CinderscapesItemTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOOD = CinderscapesItemTags.of(Identifier.of("c", "stripped_wood")); + public static final TagKey STRIPPED_WOODS = CinderscapesItemTags.of(Identifier.of("c", "stripped_woods")); public static final TagKey SULFUR_ORES = CinderscapesItemTags.of(Identifier.of("c", "sulfur_ores")); public static final TagKey SULFURS_ORES = CinderscapesItemTags.of(Identifier.of("c", "ores/sulfurs")); public static final TagKey SULFURS = CinderscapesItemTags.of(Identifier.of("c", "sulfurs")); diff --git a/common/src/main/resources/cinderscapes-common.accesswidener b/common/src/main/resources/cinderscapes-common.accesswidener index d8b2c5c4..6c9e66c8 100644 --- a/common/src/main/resources/cinderscapes-common.accesswidener +++ b/common/src/main/resources/cinderscapes-common.accesswidener @@ -1,8 +1,8 @@ accessWidener v1 named accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnLocation;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V -accessible method net/minecraft/item/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V -accessible method net/minecraft/item/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V +accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V +accessible method net/minecraft/item/equipment/trim/ArmorTrimMaterials register (Lnet/minecraft/registry/Registerable;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V accessible method net/minecraft/util/math/Vec3i setX (I)Lnet/minecraft/util/math/Vec3i; accessible method net/minecraft/util/math/Vec3i setY (I)Lnet/minecraft/util/math/Vec3i; accessible method net/minecraft/util/math/Vec3i setZ (I)Lnet/minecraft/util/math/Vec3i; diff --git a/gradle.properties b/gradle.properties index 960dd177..d8b744a1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,30 +1,26 @@ org.gradle.jvmargs=-Xmx1G -fabric.loom.multiProjectOptimisation=true maven_group=com.terraformersmc archive_name=cinderscapes -minecraft_version=1.21 -yarn_mappings=1.21+build.2 -loader_version=0.15.11 -fabric_version=0.100.4+1.21 +minecraft_version=1.21.2 +yarn_mappings=1.21.2+build.1 +loader_version=0.16.7 +fabric_version=0.106.1+1.21.2 # Terraform modules -terraform_biome_remapper_api_version=11.0.0 -terraform_shapes_api_version=11.0.0 -terraform_surfaces_api_version=11.0.0 -terraform_wood_api_version=11.0.0 +terraform_biome_remapper_api_version=12.0.0-alpha.2 +terraform_shapes_api_version=12.0.0-alpha.2 +terraform_surfaces_api_version=12.0.0-alpha.2 +terraform_wood_api_version=12.0.0-alpha.2 # Biolith for worldgen module and testing -biolith_version=3.0.0 - -# TerraBlender for worldgen module and testing -terrablender_version=1.21-4.0.0.1 +biolith_version=3.1.0-beta.1 # Other Things -clothconfig_version=15.0.127 -modmenu_version=11.0.1 -vistas_version=2.7.0 +clothconfig_version=16.0.141 +modmenu_version=12.0.0-beta.1 +vistas_version=2.8.0 # Project Metadata project_name=Cinderscapes @@ -37,14 +33,14 @@ default_release_type=stable # CurseForge Metadata curseforge_slug=cinderscapes curseforge_id=391429 -curseforge_game_versions=1.21, 1.21.1, Fabric, Quilt +curseforge_game_versions=1.21.2, 1.21.3, Fabric, Quilt curseforge_required_dependencies=fabric-api curseforge_optional_dependencies= # Modrinth Metadata modrinth_slug=cinderscapes modrinth_id=QC4wcUXZ -modrinth_game_versions=1.21, 1.21.1 +modrinth_game_versions=1.21.2, 1.21.3 modrinth_mod_loaders=fabric, quilt #modrinth_embedded_dependencies=biolith diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index da8bf6d5..87babacc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ "depends": { "fabricloader": ">=0.15.3", "fabric-api": ">=0.77.0", - "minecraft": ">=1.21 <1.21.2", + "minecraft": ">=1.21.2 <1.22", "cloth-config": "*" } } diff --git a/worldgen/build.gradle b/worldgen/build.gradle index e4914bcf..4f7f01ce 100644 --- a/worldgen/build.gradle +++ b/worldgen/build.gradle @@ -7,7 +7,6 @@ loom { dependencies { implementation project(path: ':cinderscapes-common') - // Biolith and TerraBlender for the worldgen API modules + // Biolith for the worldgen API module modImplementation "com.terraformersmc:biolith-fabric:${biolith_version}" - modCompileOnly "com.github.glitchfiend:TerraBlender-fabric:${terrablender_version}" } diff --git a/worldgen/src/main/java/com/terraformersmc/cinderscapes/biomegen/CinderscapesTerraBlenderGeneration.java b/worldgen/src/main/java/com/terraformersmc/cinderscapes/biomegen/CinderscapesTerraBlenderGeneration.java deleted file mode 100644 index 254417b0..00000000 --- a/worldgen/src/main/java/com/terraformersmc/cinderscapes/biomegen/CinderscapesTerraBlenderGeneration.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.terraformersmc.cinderscapes.biomegen; - -import com.mojang.datafixers.util.Pair; -import com.terraformersmc.biolith.api.surface.SurfaceGeneration; -import com.terraformersmc.cinderscapes.Cinderscapes; -import com.terraformersmc.cinderscapes.biome.AshyShoalsBiome; -import com.terraformersmc.cinderscapes.biome.BlackstoneShalesBiome; -import com.terraformersmc.cinderscapes.biome.LuminousGroveBiome; -import com.terraformersmc.cinderscapes.biome.QuartzCavernBiome; -import com.terraformersmc.cinderscapes.config.CinderscapesConfig; -import com.terraformersmc.cinderscapes.surfacebuilders.CinderscapesSurfaceBuilders; -import com.terraformersmc.cinderscapes.surfacerules.CinderscapesSurfaceRules; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.util.Identifier; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.source.util.MultiNoiseUtil; -import terrablender.api.*; - -import java.util.function.Consumer; - -import static com.terraformersmc.cinderscapes.init.CinderscapesBiomes.*; - -public class CinderscapesTerraBlenderGeneration extends Region implements Runnable, TerraBlenderApi { - CinderscapesConfig.BiomeOptions BIOME_CONFIG; - - public CinderscapesTerraBlenderGeneration() { - super(Identifier.of(Cinderscapes.MOD_ID, "nether"), RegionType.NETHER, 10); - } - - @Override - public void addBiomes(Registry registry, Consumer>> mapper) { - if (BIOME_CONFIG.enableAshyShoals) { addBiome(mapper, AshyShoalsBiome.NOISE_POINT, ASHY_SHOALS); } - if (BIOME_CONFIG.enableBlackstoneShales) { addBiome(mapper, BlackstoneShalesBiome.NOISE_POINT, BLACKSTONE_SHALES); } - if (BIOME_CONFIG.enableLuminousGrove) { addBiome(mapper, LuminousGroveBiome.NOISE_POINT, LUMINOUS_GROVE); } - if (BIOME_CONFIG.enableQuartzCavern) { addBiome(mapper, QuartzCavernBiome.NOISE_POINT, QUARTZ_CAVERN); } - } - - @Override - public void onTerraBlenderInitialized() { - // We can't do registration stuff until both Cinderscapes and TerraBlender are ready. - // The run() method below will be called when Cinderscapes is done initializing. - Cinderscapes.callbackWhenInitialized(CinderscapesSurfaceBuilders::init); - Cinderscapes.callbackWhenInitialized(this); - } - - // Initialize TerraBlender as our biome placement provider. - @Override - public void run() { - // Register the Cinderscapes surface rules; this must happen before we call addSurfaceRules(). - CinderscapesSurfaceRules.init(); - - // Add the Cinderscapes Overworld surface rules via TerraBlender. - SurfaceRuleManager.addSurfaceRules(SurfaceRuleManager.RuleCategory.NETHER, Cinderscapes.MOD_ID, CinderscapesSurfaceRules.createRules()); - - // Register the Cinderscapes surface builders. - CinderscapesSurfaceBuilders.getBuilders().forEach(SurfaceGeneration::addSurfaceBuilder); - - // Add the biomes to Overworld generation via TerraBlender. - BIOME_CONFIG = CinderscapesConfig.INSTANCE.biomes; - Regions.register(this); - } -} diff --git a/worldgen/src/main/java/com/terraformersmc/cinderscapes/surfacebuilders/LuminousGroveSurfaceBuilder.java b/worldgen/src/main/java/com/terraformersmc/cinderscapes/surfacebuilders/LuminousGroveSurfaceBuilder.java index 1cbccd0f..22a6b695 100644 --- a/worldgen/src/main/java/com/terraformersmc/cinderscapes/surfacebuilders/LuminousGroveSurfaceBuilder.java +++ b/worldgen/src/main/java/com/terraformersmc/cinderscapes/surfacebuilders/LuminousGroveSurfaceBuilder.java @@ -28,7 +28,8 @@ public void generate(BiomeAccess biomeAccess, BlockColumn column, Random rand, C boolean inAir = false; // Set in-biome netherrack - for (int y = chunk.getTopY() - 6; y >= seaLevel - 1; --y) { + // TODO: It would be nicer to make this start below the ceiling bedrock. + for (int y = chunk.getTopYInclusive(); y >= seaLevel - 1; --y) { BlockState state = column.getState(y); if (state.isAir()) { inAir = true; diff --git a/worldgen/src/main/resources/fabric.mod.json b/worldgen/src/main/resources/fabric.mod.json index 38269da4..daa8d03c 100644 --- a/worldgen/src/main/resources/fabric.mod.json +++ b/worldgen/src/main/resources/fabric.mod.json @@ -21,6 +21,6 @@ } }, "depends": { - "biolith": ">=1.2.0-beta.1" + "biolith": ">=3.0.0" } }