fixes

tyap-lyap · Jul 13, 2024 · 07cf685 · 07cf685
1 parent 901de89
commit 07cf685
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/winterly-common/src/main/resources/data/winterly/loot_table/blocks/raw_cryomarble_shard.json b/winterly-common/src/main/resources/data/winterly/loot_table/blocks/raw_cryomarble_shard.json
@@ -14,14 +14,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],
@@ -41,4 +43,4 @@
       ]
     }
   ]
-}
+}
diff --git a/winterly-fabric/src/main/java/ru/pinkgoosik/winterly/fabric/registry/WinterlyFeatures.java b/winterly-fabric/src/main/java/ru/pinkgoosik/winterly/fabric/registry/WinterlyFeatures.java
@@ -2,13 +2,11 @@
 
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.ModificationPhase;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BiomeTags;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.levelgen.feature.Feature;
@@ -37,14 +35,13 @@ public static void init() {
 		BiomeModifications.create(Winterly.id("features"))
 				.add(ModificationPhase.ADDITIONS, ctx -> {
 					var entry = ctx.getBiomeRegistryEntry();
-					var coldTag = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("c", "climate_cold"));
-					return !entry.is(BiomeTags.IS_NETHER) && !entry.is(BiomeTags.IS_END) && entry.is(coldTag);
+					return !entry.is(ConventionalBiomeTags.IS_NETHER) && !entry.is(ConventionalBiomeTags.IS_END) && entry.is(ConventionalBiomeTags.IS_COLD_OVERWORLD);
 				}, ctx -> {
 					ctx.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, UNDERGROUND_ICICLE_PLACED);
 				})
 				.add(ModificationPhase.ADDITIONS, ctx -> {
 					var entry = ctx.getBiomeRegistryEntry();
-					return !entry.is(BiomeTags.IS_NETHER) && !entry.is(BiomeTags.IS_END);
+					return !entry.is(ConventionalBiomeTags.IS_NETHER) && !entry.is(ConventionalBiomeTags.IS_END);
 				}, ctx -> {
 					ctx.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, CRYOMARBLE_PLACED);
 				});

diff --git a/...neoforge/src/main/resources/data/winterly/neoforge/biome_modifier/underground_icicle.json b/...neoforge/src/main/resources/data/winterly/neoforge/biome_modifier/underground_icicle.json
@@ -1,6 +1,6 @@
 {
   "type": "neoforge:add_features",
-  "biomes": "#forge:is_cold/overworld",
+  "biomes": "#c:is_cold/overworld",
   "features": "winterly:underground_icicle",
   "step": "underground_decoration"
-}
+}