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

@@ -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"

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"
 }

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": "暗影疣块"
 }