Update mod to Minecraft snapshot 24w44a (#4197)

* Update mod to Minecraft snapshot 24w44a * Bump version --------- Co-authored-by: modmuss50 <modmuss50@gmail.com>
FabricMC · Oct 30, 2024 · 7feeb73 · 7feeb73
1 parent fd37071
commit 7feeb73
Show file tree

Hide file tree

Showing 100 changed files with 497 additions and 579 deletions.
diff --git a/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*"
   },

diff --git a/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json b/deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*"
   },

diff --git a/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json
@@ -21,7 +21,7 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "minecraft": ">=1.18.2"
   },
   "description": "Contains common tags used by mods for vanilla things.",

diff --git a/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json b/deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-key-binding-api-v1": "*"
   },
   "description": "Keybinding registry API.",

diff --git a/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json b/deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-resource-loader-v0": "*"
   },

diff --git a/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json b/deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-block-view-api-v2": "*"
   },
   "description": "Thread-safe hooks for block entity data use during terrain rendering.",

diff --git a/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json b/deprecated/fabric-rendering-v0/src/client/resources/fabric.mod.json
@@ -21,7 +21,7 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "minecraft": ">=1.15-alpha.19.39.a",
     "fabric-api-base": "*",
     "fabric-rendering-v1": "*"

diff --git a/fabric-api-base/src/main/resources/fabric.mod.json b/fabric-api-base/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8"
+    "fabricloader": ">=0.16.9"
   },
   "description": "Contains the essentials for Fabric API modules.",
   "custom": {

diff --git a/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json b/fabric-api-lookup-api-v1/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-lifecycle-events-v1": "*"
   },

diff --git a/...biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java b/...biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeModificationContext.java
@@ -30,6 +30,7 @@
 import net.minecraft.sound.BiomeMoodSound;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.collection.DataPool;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;
 import net.minecraft.world.biome.BiomeParticleConfig;
@@ -270,23 +271,37 @@ default void clearAdditionsSound() {
 		 * @see BiomeEffects#getMusic()
 		 * @see BiomeEffects.Builder#music(MusicSound)
 		 */
-		void setMusic(Optional<MusicSound> sound);
+		void setMusic(Optional<DataPool<MusicSound>> sound);
 
 		/**
 		 * @see BiomeEffects#getMusic()
 		 * @see BiomeEffects.Builder#music(MusicSound)
 		 */
-		default void setMusic(@NotNull MusicSound sound) {
+		default void setMusic(@NotNull DataPool<MusicSound> sound) {
 			setMusic(Optional.of(sound));
 		}
 
+		/**
+		 * @see BiomeEffects#getMusic()
+		 * @see BiomeEffects.Builder#music(MusicSound)
+		 */
+		default void setMusic(@NotNull MusicSound sound) {
+			setMusic(DataPool.of(sound));
+		}
+
 		/**
 		 * @see BiomeEffects#getMusic()
 		 * @see BiomeEffects.Builder#music(MusicSound)
 		 */
 		default void clearMusic() {
 			setMusic(Optional.empty());
 		}
+
+		/**
+		 * @see BiomeEffects#method_65135()
+		 * @see BiomeEffects.Builder#method_65137(int)
+		 */
+		void setMusicVolume(float volume);
 	}
 
 	interface GenerationSettingsContext {

diff --git a/...c/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java b/...c/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java
@@ -45,6 +45,7 @@
 import net.minecraft.sound.BiomeMoodSound;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.collection.DataPool;
 import net.minecraft.util.collection.Pool;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeEffects;
@@ -188,9 +189,14 @@ public void setAdditionsSound(Optional<BiomeAdditionsSound> sound) {
 		}
 
 		@Override
-		public void setMusic(Optional<MusicSound> sound) {
+		public void setMusic(Optional<DataPool<MusicSound>> sound) {
 			effects.music = Objects.requireNonNull(sound);
 		}
+
+		@Override
+		public void setMusicVolume(float volume) {
+			effects.field_55050 = volume;
+		}
 	}
 
 	private class GenerationSettingsContextImpl implements GenerationSettingsContext {

diff --git a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener
@@ -35,6 +35,8 @@ accessible field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/uti
 mutable field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/util/Optional;
 accessible field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional;
 mutable field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional;
+accessible field net/minecraft/world/biome/BiomeEffects field_55050 F
+mutable field net/minecraft/world/biome/BiomeEffects field_55050 F
 
 # Spawn Settings / Density
 accessible field net/minecraft/world/biome/SpawnSettings creatureSpawnProbability F

diff --git a/fabric-biome-api-v1/src/main/resources/fabric.mod.json b/fabric-biome-api-v1/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "minecraft": ">=1.16.2"
   },
   "description": "Hooks for adding biomes to the default world generator.",

diff --git a/.../src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/custom_plains.json b/.../src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/custom_plains.json
@@ -13,6 +13,7 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "music_volume": 1.0,
     "sky_color": 7907327,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/.../src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/example_biome.json b/.../src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/example_biome.json
@@ -3,6 +3,7 @@
   "downfall": 0.4,
   "effects": {
     "fog_color": 12638463,
+    "music_volume": 1.0,
     "sky_color": 7907327,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/...estmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_crimson_forest.json b/...estmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_crimson_forest.json
@@ -14,12 +14,18 @@
       "sound": "minecraft:ambient.crimson_forest.mood",
       "tick_delay": 6000
     },
-    "music": {
-      "max_delay": 24000,
-      "min_delay": 12000,
-      "replace_current_music": false,
-      "sound": "minecraft:music.nether.crimson_forest"
-    },
+    "music": [
+      {
+        "data": {
+          "max_delay": 24000,
+          "min_delay": 12000,
+          "replace_current_music": false,
+          "sound": "minecraft:music.nether.crimson_forest"
+        },
+        "weight": 1
+      }
+    ],
+    "music_volume": 1.0,
     "particle": {
       "options": {
         "type": "minecraft:crimson_spore"

diff --git a/...c/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_barrens.json b/...c/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_barrens.json
@@ -9,6 +9,7 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "music_volume": 1.0,
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/...testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_highlands.json b/...testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_highlands.json
@@ -9,6 +9,7 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "music_volume": 1.0,
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/.../testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_midlands.json b/.../testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_midlands.json
@@ -9,6 +9,7 @@
       "sound": "minecraft:ambient.cave",
       "tick_delay": 6000
     },
+    "music_volume": 1.0,
     "sky_color": 0,
     "water_color": 4159204,
     "water_fog_color": 329011

diff --git a/fabric-block-api-v1/src/main/resources/fabric.mod.json b/fabric-block-api-v1/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8"
+    "fabricloader": ">=0.16.9"
   },
   "entrypoints": {
   },

diff --git a/fabric-block-view-api-v2/src/main/resources/fabric.mod.json b/fabric-block-view-api-v2/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8"
+    "fabricloader": ">=0.16.9"
   },
   "description": "Hooks for block views",
   "mixins": [

diff --git a/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json b/fabric-blockrenderlayer-v1/src/client/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "minecraft": ">=1.15-alpha.19.38.b",
     "fabric-api-base": "*"
   },

diff --git a/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json b/fabric-client-tags-api-v1/src/client/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8"
+    "fabricloader": ">=0.16.9"
   },
   "description": "Adds the ability to load tags from the local mods.",
   "custom": {

diff --git a/fabric-command-api-v2/src/main/resources/fabric.mod.json b/fabric-command-api-v2/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "minecraft": ">1.19-alpha.22.11.a"
   },

diff --git a/fabric-content-registries-v0/src/main/resources/fabric.mod.json b/fabric-content-registries-v0/src/main/resources/fabric.mod.json
@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.8",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-lifecycle-events-v1": "*",
     "fabric-resource-loader-v0": "*"

diff --git a/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
@@ -24,7 +24,6 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeKeys;
-import net.minecraft.world.biome.WinterDropBuiltinBiomes;
 
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
@@ -97,7 +96,7 @@ private void generateCategoryTags() {
 				.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
 		getOrCreateTagBuilder(ConventionalBiomeTags.IS_DARK_FOREST)
 				.add(BiomeKeys.DARK_FOREST)
-				.addOptional(WinterDropBuiltinBiomes.PALE_GARDEN);
+				.add(BiomeKeys.PALE_GARDEN);
 		getOrCreateTagBuilder(ConventionalBiomeTags.IS_OCEAN)
 				.addOptionalTag(BiomeTags.IS_OCEAN)
 				.addOptionalTag(ConventionalBiomeTags.IS_DEEP_OCEAN)
@@ -179,7 +178,7 @@ private void generateClimateAndVegetationTags() {
 				.add(BiomeKeys.SWAMP)
 				.add(BiomeKeys.STONY_SHORE)
 				.add(BiomeKeys.DARK_FOREST)
-				.addOptional(WinterDropBuiltinBiomes.PALE_GARDEN)
+				.add(BiomeKeys.PALE_GARDEN)
 				.add(BiomeKeys.WINDSWEPT_FOREST)
 				.add(BiomeKeys.BIRCH_FOREST)
 				.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
@@ -252,7 +251,7 @@ private void generateClimateAndVegetationTags() {
 
 		getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD)
 				.add(BiomeKeys.DARK_FOREST)
-				.addOptional(WinterDropBuiltinBiomes.PALE_GARDEN)
+				.add(BiomeKeys.PALE_GARDEN)
 				.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
 				.add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA)
 				.add(BiomeKeys.JUNGLE)
@@ -285,7 +284,7 @@ private void generateClimateAndVegetationTags() {
 				.add(BiomeKeys.FLOWER_FOREST)
 				.add(BiomeKeys.BIRCH_FOREST)
 				.add(BiomeKeys.DARK_FOREST)
-				.addOptional(WinterDropBuiltinBiomes.PALE_GARDEN)
+				.add(BiomeKeys.PALE_GARDEN)
 				.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
 		getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE)
 				.addOptionalTag(ConventionalBiomeTags.IS_JUNGLE);

diff --git a/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
@@ -447,6 +447,7 @@ private void generateStorageTags() {
 				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_RAW_GOLD)
 				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_RAW_IRON)
 				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE)
+				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_RESIN)
 				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_SLIME)
 				.addTag(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT);
 
@@ -492,6 +493,9 @@ private void generateStorageTags() {
 		getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE)
 				.add(Blocks.REDSTONE_BLOCK);
 
+		getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_RESIN)
+				.add(Blocks.RESIN_BLOCK);
+
 		getOrCreateTagBuilder(ConventionalBlockTags.STORAGE_BLOCKS_SLIME)
 				.add(Blocks.SLIME_BLOCK);
 

diff --git a/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
@@ -107,6 +107,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_RAW_GOLD, "Raw Gold Storage Blocks");
 		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_RAW_IRON, "Raw Iron Storage Blocks");
 		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks");
+		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_RESIN, "Resin Storage Blocks");
 		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
 		translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
 		translationBuilder.add(ConventionalBlockTags.STRIPPED_LOGS, "Stripped Logs");
@@ -152,6 +153,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalItemTags.ENCHANTABLES, "Enchantables");
 		translationBuilder.add(ConventionalItemTags.BRICKS, "Bricks");
 		translationBuilder.add(ConventionalItemTags.DUSTS, "Dusts");
+		translationBuilder.add(ConventionalItemTags.CLUMPS, "Clumps");
 		translationBuilder.add(ConventionalItemTags.GEMS, "Gems");
 		translationBuilder.add(ConventionalItemTags.INGOTS, "Ingots");
 		translationBuilder.add(ConventionalItemTags.NUGGETS, "Nuggets");
@@ -166,6 +168,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalItemTags.COPPER_RAW_BLOCKS, "Raw Copper Blocks");
 		translationBuilder.add(ConventionalItemTags.NORMAL_BRICKS, "Bricks");
 		translationBuilder.add(ConventionalItemTags.NETHER_BRICKS, "Nether Bricks");
+		translationBuilder.add(ConventionalItemTags.RESIN_BRICKS, "Resin Bricks");
 		translationBuilder.add(ConventionalItemTags.IRON_INGOTS, "Iron Ingots");
 		translationBuilder.add(ConventionalItemTags.GOLD_INGOTS, "Gold Ingots");
 		translationBuilder.add(ConventionalItemTags.COPPER_INGOTS, "Copper Ingots");
@@ -182,6 +185,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalItemTags.GOLD_NUGGETS, "Gold Nuggets");
 		translationBuilder.add(ConventionalItemTags.REDSTONE_DUSTS, "Redstone Dusts");
 		translationBuilder.add(ConventionalItemTags.GLOWSTONE_DUSTS, "Glowstone Dusts");
+		translationBuilder.add(ConventionalItemTags.RESIN_CLUMPS, "Resin Clumps");
 		translationBuilder.add(ConventionalItemTags.COAL, "Coal");
 		translationBuilder.add(ConventionalItemTags.POTIONS, "Potions");
 		translationBuilder.add(ConventionalItemTags.FOODS, "Foods");
@@ -299,6 +303,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_RAW_GOLD, "Raw Gold Storage Blocks");
 		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_RAW_IRON, "Raw Iron Storage Blocks");
 		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks");
+		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_RESIN, "Resin Storage Blocks");
 		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
 		translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
 		translationBuilder.add(ConventionalItemTags.STRIPPED_LOGS, "Stripped Log Blocks");