Update to 1.21-pre2.

- Update to 1.21-pre2

Author: gniftygnome

client/src/main/resources/assets/cinderscapes/lang/en_us.json

@@ -140,5 +140,21 @@
   "trim_material.cinderscapes.sulfur_quartz": "Sulfur Quartz Material",
 
   "block.cinderscapes.nodzol": "Nodzol",
-  "block.cinderscapes.nodzol.description": "This block is nursed..."
+  "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"
 }

common/src/main/java/com/terraformersmc/cinderscapes/Cinderscapes.java

@@ -5,16 +5,15 @@
 import com.terraformersmc.cinderscapes.item.CinderscapesItemGroups;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.util.Identifier;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 
 public class Cinderscapes implements ModInitializer {
-	public static final String NAMESPACE = "cinderscapes";
-	public static final Logger LOGGER = LogManager.getLogger(StringUtils.capitalize(NAMESPACE));
+	public static final String MOD_ID = "cinderscapes";
+	public static final Logger LOGGER = LogManager.getLogger(StringUtils.capitalize(MOD_ID));
 
 	private static Boolean initialized = false;
 	private static final ArrayList<Runnable> runnables = new ArrayList<>(1);
@@ -50,8 +49,4 @@ public static void callbackWhenInitialized(Runnable callback) {
 			runnables.add(callback);
 		}
 	}
-
-	public static Identifier id(String path) {
-		return new Identifier(NAMESPACE, path);
-	}
 }

common/src/main/java/com/terraformersmc/cinderscapes/biome/AshyShoalsBiome.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacedFeatures;
 import com.terraformersmc.cinderscapes.init.CinderscapesSoundEvents;
 import com.terraformersmc.cinderscapes.mixin.OverworldBiomeCreatorAccessor;
-import net.minecraft.client.sound.MusicType;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.particle.ParticleTypes;
@@ -13,6 +12,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.sound.BiomeAdditionsSound;
 import net.minecraft.sound.BiomeMoodSound;
+import net.minecraft.sound.MusicType;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;

common/src/main/java/com/terraformersmc/cinderscapes/biome/BlackstoneShalesBiome.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacedFeatures;
 import com.terraformersmc.cinderscapes.init.CinderscapesSoundEvents;
 import com.terraformersmc.cinderscapes.mixin.OverworldBiomeCreatorAccessor;
-import net.minecraft.client.sound.MusicType;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.particle.ParticleTypes;
@@ -13,6 +12,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.sound.BiomeAdditionsSound;
 import net.minecraft.sound.BiomeMoodSound;
+import net.minecraft.sound.MusicType;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;

common/src/main/java/com/terraformersmc/cinderscapes/biome/CinderscapesBiomeRemappings.java

@@ -7,7 +7,7 @@
 
 public class CinderscapesBiomeRemappings implements BiomeRemapperApi {
 	public void init() {
-		register(Cinderscapes.NAMESPACE, DataVersions.V_1_18_2, ImmutableMap.<String, String>builder()
+		register(Cinderscapes.MOD_ID, DataVersions.V_1_18_2, ImmutableMap.<String, String>builder()
 				.put("cinderscapes:quartz_canyon", "cinderscapes:quartz_cavern")
 				.build());
 	}

common/src/main/java/com/terraformersmc/cinderscapes/biome/LuminousGroveBiome.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacedFeatures;
 import com.terraformersmc.cinderscapes.init.CinderscapesSoundEvents;
 import com.terraformersmc.cinderscapes.mixin.OverworldBiomeCreatorAccessor;
-import net.minecraft.client.sound.MusicType;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.particle.ParticleTypes;
@@ -13,6 +12,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.sound.BiomeAdditionsSound;
 import net.minecraft.sound.BiomeMoodSound;
+import net.minecraft.sound.MusicType;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;

common/src/main/java/com/terraformersmc/cinderscapes/biome/QuartzCavernBiome.java

@@ -3,7 +3,6 @@
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacedFeatures;
 import com.terraformersmc.cinderscapes.init.CinderscapesSoundEvents;
 import com.terraformersmc.cinderscapes.mixin.OverworldBiomeCreatorAccessor;
-import net.minecraft.client.sound.MusicType;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.particle.ParticleTypes;
@@ -13,6 +12,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.sound.BiomeAdditionsSound;
 import net.minecraft.sound.BiomeMoodSound;
+import net.minecraft.sound.MusicType;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;

common/src/main/java/com/terraformersmc/cinderscapes/config/CinderscapesConfig.java

@@ -7,7 +7,7 @@
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 
-@Config(name = Cinderscapes.NAMESPACE)
+@Config(name = Cinderscapes.MOD_ID)
 public final class CinderscapesConfig implements ConfigData {
     @ConfigEntry.Gui.Excluded
     public static CinderscapesConfig INSTANCE;

common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java

@@ -3,7 +3,7 @@
 import com.terraformersmc.cinderscapes.init.CinderscapesBiomes;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
-import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.BiomeTags;
@@ -19,21 +19,21 @@ protected CinderscapesBiomeTagProvider(FabricDataOutput output, CompletableFutur
 	@Override
 	public void configure(RegistryWrapper.WrapperLookup registries) {
 		/*
-		 * Vanilla biome categories
+		 * Vanilla and Conventional biome categories
 		 */
 		getOrCreateTagBuilder(BiomeTags.IS_NETHER)
 			.addOptional(CinderscapesBiomes.ASHY_SHOALS)
 			.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES)
 			.addOptional(CinderscapesBiomes.LUMINOUS_GROVE)
 			.addOptional(CinderscapesBiomes.QUARTZ_CAVERN);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.NETHER_FORESTS)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST)
 			.addOptional(CinderscapesBiomes.LUMINOUS_GROVE);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.WASTELAND)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND)
 			.addOptional(CinderscapesBiomes.ASHY_SHOALS);
 
-		getOrCreateTagBuilder(ConventionalBiomeTags.VEGETATION_SPARSE)
+		getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE)
 			.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES);
 
 

common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockLootTableProvider.java

@@ -8,6 +8,7 @@
 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;
 import net.minecraft.loot.LootPool;
@@ -22,17 +23,25 @@
 import net.minecraft.loot.provider.number.ConstantLootNumberProvider;
 import net.minecraft.loot.provider.number.UniformLootNumberProvider;
 import net.minecraft.predicate.StatePredicate;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 
 import java.util.concurrent.CompletableFuture;
 
 public class CinderscapesBlockLootTableProvider extends FabricBlockLootTableProvider {
+	private final CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture;
+
 	protected CinderscapesBlockLootTableProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
 		super(output, registriesFuture);
+
+		this.registriesFuture = registriesFuture;
 	}
 
 	@Override
 	public void generate() {
+		RegistryWrapper.Impl<Enchantment> enchantmentRegistry = registriesFuture.getNow(null)
+				.getWrapperOrThrow(RegistryKeys.ENCHANTMENT);
+
 		// simple blocks
 		addDrop(CinderscapesBlocks.ASH_BLOCK);
 		addDrop(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK);
@@ -156,12 +165,12 @@ public void generate() {
 			.pool(
 				LootPool.builder().conditionally(BlockStatePropertyLootCondition.builder(CinderscapesBlocks.BRAMBLE_BERRY_BUSH).properties(StatePredicate.Builder.create().exactMatch(BrambleBerryBushBlock.AGE, 3)))
 					.with(ItemEntry.builder(CinderscapesItems.BRAMBLE_BERRIES)).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2.0f, 3.0f)))
-					.apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))
+					.apply(ApplyBonusLootFunction.uniformBonusCount(enchantmentRegistry.getOrThrow(Enchantments.FORTUNE)))
 			)
 			.pool(
 				LootPool.builder().conditionally(BlockStatePropertyLootCondition.builder(CinderscapesBlocks.BRAMBLE_BERRY_BUSH).properties(StatePredicate.Builder.create().exactMatch(BrambleBerryBushBlock.AGE, 2)))
 					.with(ItemEntry.builder(CinderscapesItems.BRAMBLE_BERRIES)).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1.0f, 2.0f)))
-					.apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))
+					.apply(ApplyBonusLootFunction.uniformBonusCount(enchantmentRegistry.getOrThrow(Enchantments.FORTUNE)))
 			)
 		));
 
@@ -174,7 +183,7 @@ public void generate() {
 									AshLayerBlock.LAYERS.getValues(), layers -> ItemEntry.builder(CinderscapesItems.ASH_PILE)
 											.conditionally(BlockStatePropertyLootCondition.builder(block).properties(StatePredicate.Builder.create().exactMatch(AshLayerBlock.LAYERS, layers)))
 											.apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(layers)))
-							).conditionally(WITHOUT_SILK_TOUCH),
+							).conditionally(createWithoutSilkTouchCondition()),
 								AlternativeEntry.builder(
 										AshLayerBlock.LAYERS.getValues(), layers -> layers == 8 ? ItemEntry.builder(CinderscapesBlocks.ASH_BLOCK) : ItemEntry.builder(CinderscapesBlocks.ASH)
 												.conditionally(BlockStatePropertyLootCondition.builder(block).properties(StatePredicate.Builder.create().exactMatch(AshLayerBlock.LAYERS, layers)))