Merge branch '1.20.6' into 1.20.4

CHANGELOG.md

@@ -5,29 +5,5 @@ Make sure to clear this after each release
 Put changelog here:
 
 -----------------
-- Added JavaDocs to classes that may be used frequently for ease of use outside FrozenBlock.
-- Added a `disable` method to the `FrozenBiome` that prevents it from automatically being injected into worldgen.
-- The `windoverride` command has been revamped and renamed to `wind.`
-- Added the `EntityLootHelper` class, currently containing the `shouldSmeltLoot` method.
-- Added the `TintRegistryHelper` class, making simple registry of block and item tints quicker.
-- Significantly optimized how structure info is sent to the client in debug mode.
-- Added the new `BeaconEffectRegistry` class, which can be used to add a Mob Effect to any Beacon tier.
-- Added the new `SherdRegsistry` class, which can be used to easily implement new Pottery Sherds.
-- Added the new `DecoratedPotPatternRegsitryEntrypoint` interface, which can be used to register new Decorated Pot Patterns.
-  - The entrypoint's identitier is `frozenlib:decorated_pot_patterns`
-- Fixed `FadingDiskCarpetFeature` using an incorrect position to determine if a block can survive.
-- Added the `CapeRegistry` class which can be used to register custom capes.
-  - Currently, these capes can only be accessed through FrozenLib's config.
-  - An optional list of allowed UUIDs can be defined for capes.
-- Fixed the `ColumnWithDiskFeature` not generating as intended.
-- Added an API to send and receive files between the client and server.
-  - This is useful in cases where, for example, you want to send a screenshot from Minecraft to the server to be used as a texture.
-  - This can be disabled both client-side and server-side separately in FrozenLib's config.
-- Significantly optimized DataFixing.
-  - In cases where something like a structure with a pre-defined set of DataVersions is loaded and a separate mod with a DataFixer is loaded, the new DataFixer would run for every structure piece.
-  - This would cause tremendous amounts of lag while not fixing any data, as no fixable data was present to begin with.
-  - Due to this optimization, we recommend that any mods using FrozenLib implement a DataFixer, even an empty one, so it will have a 100% success rate of DataFixing.
-- Added `IS_DATAGEN` to the `FrozenBools` class.
-  - This is useful in cases you want to remove a BlockState Property during datagen so it doesn't create unnecessary data.
-- `PlayerDamageSourceSounds` has been renamed to `PlayerDamageTypeSounds,` and now takes DamageType as a parameter instead of DamageSource.
-- Added missing particle-related features to `BonemealBehaviors` in 1.21+.
+- Block sound overwrites now work on servers.
+- FrozenLib's `fabric.mod.json` no longer requires a specific Fabric API.

build.gradle.kts

@@ -20,7 +20,7 @@ buildscript {
 }
 
 plugins {
-	id("fabric-loom") version("1.7.+")
+	id("fabric-loom") version("+")
 	id("org.ajoberstar.grgit") version("+")
 	id("org.quiltmc.gradle.licenser") version("+")
 	id("com.modrinth.minotaur") version("+")
@@ -30,7 +30,7 @@ plugins {
     idea
     `java-library`
     java
-    kotlin("jvm") version("2.0.20")
+    kotlin("jvm") version("2.0.21")
 }
 
 val minecraft_version: String by project

gradle.properties

@@ -15,7 +15,7 @@
 	min_loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.9
+	mod_version = 1.9.1
 	maven_group = net.frozenblock
 	archives_base_name = FrozenLib
 

src/main/java/net/frozenblock/lib/FrozenMain.java

@@ -20,6 +20,7 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.loader.api.ModContainer;
 import net.frozenblock.lib.cape.impl.ServerCapeData;
 import net.frozenblock.lib.config.api.instance.Config;
@@ -41,6 +42,7 @@
 import net.frozenblock.lib.screenshake.api.command.ScreenShakeCommand;
 import net.frozenblock.lib.screenshake.impl.ScreenShakeStorage;
 import net.frozenblock.lib.sound.api.predicate.SoundPredicate;
+import net.frozenblock.lib.sound.impl.block_sound_group.BlockSoundGroupManager;
 import net.frozenblock.lib.spotting_icons.api.SpottingIconPredicate;
 import net.frozenblock.lib.tag.api.TagKeyArgument;
 import net.frozenblock.lib.tag.api.TagListCommand;
@@ -59,6 +61,7 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.commands.WardenSpawnTrackerCommand;
+import net.minecraft.server.packs.PackType;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -159,6 +162,9 @@ public void onInitialize(String modId, ModContainer container) {
 				config.save();
 			}
 		});
+
+		var resourceLoader = ResourceManagerHelper.get(PackType.SERVER_DATA);
+		resourceLoader.registerReloadListener(BlockSoundGroupManager.INSTANCE);
 	}
 
 	@Contract("_ -> new")

src/main/resources/fabric.mod.json

@@ -79,7 +79,7 @@
   "accessWidener": "frozenlib.accesswidener",
   "depends": {
     "fabricloader": "${fabric_loader_version}",
-    "fabric-api": "${fabric_api_version}",
+    "fabric-api": "*",
     "minecraft": "${minecraft_version}"
   },
   "suggests": {

src/testmod/java/net/frozenblock/lib/testmod/FrozenTestMain.java

@@ -20,9 +20,11 @@
 import com.mojang.datafixers.schemas.Schema;
 import java.util.List;
 import net.fabricmc.api.ModInitializer;
+/*
 import net.fabricmc.frozenblock.datafixer.api.FabricDataFixerBuilder;
 import net.fabricmc.frozenblock.datafixer.api.FabricDataFixes;
 import net.fabricmc.frozenblock.datafixer.api.SimpleFixes;
+ */
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.frozenblock.lib.FrozenSharedConstants;
@@ -100,6 +102,7 @@ public void onInitialize() {
 	private static final int DATA_VERSION = 1;
 
 	private static void applyDataFixes(ModContainer mod) {
+		/*
 		LOGGER.info("Applying DataFixes for FrozenLib Testmod");
 		var builder = new FabricDataFixerBuilder(DATA_VERSION);
 		builder.addSchema(0, FabricDataFixes.getBaseSchema());
@@ -108,6 +111,7 @@ private static void applyDataFixes(ModContainer mod) {
 
 		FabricDataFixes.buildAndRegisterFixer(mod, builder);
 		LOGGER.info("DataFixes for FrozenLib Testmod have been applied");
+		 */
 	}
 
 	public static ResourceLocation id(String path) {