1.21 port

luxtracon · Jun 15, 2024 · 447c7a2 · 447c7a2
1 parent e9eaf97
commit 447c7a2
Show file tree

Hide file tree

Showing 281 changed files with 705 additions and 888 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.133'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
 }
 
 version = mod_version
@@ -27,7 +27,8 @@ base {
 // Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager
 
 // Default run configurations.
 // These can be tweaked, removed, or duplicated as needed.

diff --git a/gradle.properties b/gradle.properties
@@ -10,19 +10,19 @@ neogradle.subsystems.parchment.mappingsVersion=2024.06.02
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.20.6
+minecraft_version=1.21
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.6,1.21)
+minecraft_version_range=[1.21,1.21.1)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=20.6.110-beta
+neo_version=21.0.0-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[20.6,)
+neo_version_range=[21.0.0-beta,)
 # The loader version range can only use the major version of FML as bounds
-loader_version_range=[2,)
+loader_version_range=[4,)
 
-jade_version=5366595
+jade_version=5427817
 
 ## Mod Properties
 
@@ -34,7 +34,7 @@ mod_name=Floralis
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT License
 # The mod version. See https://semver.org/
-mod_version=15.0.0
+mod_version=16.0.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

diff --git a/...es/data/c/tags/blocks/storage_blocks.json → ...ces/data/c/tags/block/storage_blocks.json b/...es/data/c/tags/blocks/storage_blocks.json → ...ces/data/c/tags/block/storage_blocks.json
diff --git a/...sources/data/c/tags/items/fertilizer.json → ...esources/data/c/tags/item/fertilizer.json b/...sources/data/c/tags/items/fertilizer.json → ...esources/data/c/tags/item/fertilizer.json
diff --git a/...ed/resources/data/c/tags/items/seeds.json → ...ted/resources/data/c/tags/item/seeds.json b/...ed/resources/data/c/tags/items/seeds.json → ...ted/resources/data/c/tags/item/seeds.json
diff --git a/...ces/data/c/tags/items/storage_blocks.json → ...rces/data/c/tags/item/storage_blocks.json b/...ces/data/c/tags/items/storage_blocks.json → ...rces/data/c/tags/item/storage_blocks.json
diff --git a/.../misc/black_dye_block_from_black_dye.json → .../misc/black_dye_block_from_black_dye.json b/.../misc/black_dye_block_from_black_dye.json → .../misc/black_dye_block_from_black_dye.json
diff --git a/.../misc/black_dye_from_black_dye_block.json → .../misc/black_dye_from_black_dye_block.json b/.../misc/black_dye_from_black_dye_block.json → .../misc/black_dye_from_black_dye_block.json
diff --git a/...black_dye_from_smelting_black_petals.json → ...black_dye_from_smelting_black_petals.json b/...black_dye_from_smelting_black_petals.json → ...black_dye_from_smelting_black_petals.json
diff --git a/...es/misc/blue_dye_block_from_blue_dye.json → ...es/misc/blue_dye_block_from_blue_dye.json b/...es/misc/blue_dye_block_from_blue_dye.json → ...es/misc/blue_dye_block_from_blue_dye.json
diff --git a/...es/misc/blue_dye_from_blue_dye_block.json → ...es/misc/blue_dye_from_blue_dye_block.json b/...es/misc/blue_dye_from_blue_dye_block.json → ...es/misc/blue_dye_from_blue_dye_block.json
diff --git a/...c/blue_dye_from_smelting_blue_petals.json → ...c/blue_dye_from_smelting_blue_petals.json b/...c/blue_dye_from_smelting_blue_petals.json → ...c/blue_dye_from_smelting_blue_petals.json
diff --git a/.../misc/brown_dye_block_from_brown_dye.json → .../misc/brown_dye_block_from_brown_dye.json b/.../misc/brown_dye_block_from_brown_dye.json → .../misc/brown_dye_block_from_brown_dye.json
diff --git a/.../misc/brown_dye_from_brown_dye_block.json → .../misc/brown_dye_from_brown_dye_block.json b/.../misc/brown_dye_from_brown_dye_block.json → .../misc/brown_dye_from_brown_dye_block.json
diff --git a/...brown_dye_from_smelting_brown_petals.json → ...brown_dye_from_smelting_brown_petals.json b/...brown_dye_from_smelting_brown_petals.json → ...brown_dye_from_smelting_brown_petals.json
diff --git a/...es/misc/cyan_dye_block_from_cyan_dye.json → ...es/misc/cyan_dye_block_from_cyan_dye.json b/...es/misc/cyan_dye_block_from_cyan_dye.json → ...es/misc/cyan_dye_block_from_cyan_dye.json
diff --git a/...es/misc/cyan_dye_from_cyan_dye_block.json → ...es/misc/cyan_dye_from_cyan_dye_block.json b/...es/misc/cyan_dye_from_cyan_dye_block.json → ...es/misc/cyan_dye_from_cyan_dye_block.json
diff --git a/...c/cyan_dye_from_smelting_cyan_petals.json → ...c/cyan_dye_from_smelting_cyan_petals.json b/...c/cyan_dye_from_smelting_cyan_petals.json → ...c/cyan_dye_from_smelting_cyan_petals.json
diff --git a/...es/misc/gray_dye_block_from_gray_dye.json → ...es/misc/gray_dye_block_from_gray_dye.json b/...es/misc/gray_dye_block_from_gray_dye.json → ...es/misc/gray_dye_block_from_gray_dye.json
diff --git a/...es/misc/gray_dye_from_gray_dye_block.json → ...es/misc/gray_dye_from_gray_dye_block.json b/...es/misc/gray_dye_from_gray_dye_block.json → ...es/misc/gray_dye_from_gray_dye_block.json
diff --git a/...c/gray_dye_from_smelting_gray_petals.json → ...c/gray_dye_from_smelting_gray_petals.json b/...c/gray_dye_from_smelting_gray_petals.json → ...c/gray_dye_from_smelting_gray_petals.json
diff --git a/.../misc/green_dye_block_from_green_dye.json → .../misc/green_dye_block_from_green_dye.json b/.../misc/green_dye_block_from_green_dye.json → .../misc/green_dye_block_from_green_dye.json
diff --git a/.../misc/green_dye_from_green_dye_block.json → .../misc/green_dye_from_green_dye_block.json b/.../misc/green_dye_from_green_dye_block.json → .../misc/green_dye_from_green_dye_block.json
diff --git a/...green_dye_from_smelting_green_petals.json → ...green_dye_from_smelting_green_petals.json b/...green_dye_from_smelting_green_petals.json → ...green_dye_from_smelting_green_petals.json
diff --git a/...t_blue_dye_block_from_light_blue_dye.json → ...t_blue_dye_block_from_light_blue_dye.json b/...t_blue_dye_block_from_light_blue_dye.json → ...t_blue_dye_block_from_light_blue_dye.json
diff --git a/...t_blue_dye_from_light_blue_dye_block.json → ...t_blue_dye_from_light_blue_dye_block.json b/...t_blue_dye_from_light_blue_dye_block.json → ...t_blue_dye_from_light_blue_dye_block.json
diff --git a/..._dye_from_smelting_light_blue_petals.json → ..._dye_from_smelting_light_blue_petals.json b/..._dye_from_smelting_light_blue_petals.json → ..._dye_from_smelting_light_blue_petals.json
diff --git a/...t_gray_dye_block_from_light_gray_dye.json → ...t_gray_dye_block_from_light_gray_dye.json b/...t_gray_dye_block_from_light_gray_dye.json → ...t_gray_dye_block_from_light_gray_dye.json
diff --git a/...t_gray_dye_from_light_gray_dye_block.json → ...t_gray_dye_from_light_gray_dye_block.json b/...t_gray_dye_from_light_gray_dye_block.json → ...t_gray_dye_from_light_gray_dye_block.json
diff --git a/..._dye_from_smelting_light_gray_petals.json → ..._dye_from_smelting_light_gray_petals.json b/..._dye_from_smelting_light_gray_petals.json → ..._dye_from_smelting_light_gray_petals.json
diff --git a/...es/misc/lime_dye_block_from_lime_dye.json → ...es/misc/lime_dye_block_from_lime_dye.json b/...es/misc/lime_dye_block_from_lime_dye.json → ...es/misc/lime_dye_block_from_lime_dye.json
diff --git a/...es/misc/lime_dye_from_lime_dye_block.json → ...es/misc/lime_dye_from_lime_dye_block.json b/...es/misc/lime_dye_from_lime_dye_block.json → ...es/misc/lime_dye_from_lime_dye_block.json
diff --git a/...c/lime_dye_from_smelting_lime_petals.json → ...c/lime_dye_from_smelting_lime_petals.json b/...c/lime_dye_from_smelting_lime_petals.json → ...c/lime_dye_from_smelting_lime_petals.json
diff --git a/...c/magenta_dye_block_from_magenta_dye.json → ...c/magenta_dye_block_from_magenta_dye.json b/...c/magenta_dye_block_from_magenta_dye.json → ...c/magenta_dye_block_from_magenta_dye.json
diff --git a/...c/magenta_dye_from_magenta_dye_block.json → ...c/magenta_dye_from_magenta_dye_block.json b/...c/magenta_dye_from_magenta_dye_block.json → ...c/magenta_dye_from_magenta_dye_block.json
diff --git a/...nta_dye_from_smelting_magenta_petals.json → ...nta_dye_from_smelting_magenta_petals.json b/...nta_dye_from_smelting_magenta_petals.json → ...nta_dye_from_smelting_magenta_petals.json
diff --git a/...isc/orange_dye_block_from_orange_dye.json → ...isc/orange_dye_block_from_orange_dye.json b/...isc/orange_dye_block_from_orange_dye.json → ...isc/orange_dye_block_from_orange_dye.json
diff --git a/...isc/orange_dye_from_orange_dye_block.json → ...isc/orange_dye_from_orange_dye_block.json b/...isc/orange_dye_from_orange_dye_block.json → ...isc/orange_dye_from_orange_dye_block.json
diff --git a/...ange_dye_from_smelting_orange_petals.json → ...ange_dye_from_smelting_orange_petals.json b/...ange_dye_from_smelting_orange_petals.json → ...ange_dye_from_smelting_orange_petals.json
diff --git a/...es/misc/pink_dye_block_from_pink_dye.json → ...es/misc/pink_dye_block_from_pink_dye.json b/...es/misc/pink_dye_block_from_pink_dye.json → ...es/misc/pink_dye_block_from_pink_dye.json
diff --git a/...es/misc/pink_dye_from_pink_dye_block.json → ...es/misc/pink_dye_from_pink_dye_block.json b/...es/misc/pink_dye_from_pink_dye_block.json → ...es/misc/pink_dye_from_pink_dye_block.json
diff --git a/...c/pink_dye_from_smelting_pink_petals.json → ...c/pink_dye_from_smelting_pink_petals.json b/...c/pink_dye_from_smelting_pink_petals.json → ...c/pink_dye_from_smelting_pink_petals.json
diff --git a/...plant_fibers_block_from_plant_fibers.json → ...plant_fibers_block_from_plant_fibers.json b/...plant_fibers_block_from_plant_fibers.json → ...plant_fibers_block_from_plant_fibers.json
diff --git a/...plant_fibers_from_plant_fibers_block.json → ...plant_fibers_from_plant_fibers_block.json b/...plant_fibers_from_plant_fibers_block.json → ...plant_fibers_from_plant_fibers_block.json
diff --git a/...isc/purple_dye_block_from_purple_dye.json → ...isc/purple_dye_block_from_purple_dye.json b/...isc/purple_dye_block_from_purple_dye.json → ...isc/purple_dye_block_from_purple_dye.json
diff --git a/...isc/purple_dye_from_purple_dye_block.json → ...isc/purple_dye_from_purple_dye_block.json b/...isc/purple_dye_from_purple_dye_block.json → ...isc/purple_dye_from_purple_dye_block.json
diff --git a/...rple_dye_from_smelting_purple_petals.json → ...rple_dye_from_smelting_purple_petals.json b/...rple_dye_from_smelting_purple_petals.json → ...rple_dye_from_smelting_purple_petals.json
diff --git a/...ipes/misc/red_dye_block_from_red_dye.json → ...ipes/misc/red_dye_block_from_red_dye.json b/...ipes/misc/red_dye_block_from_red_dye.json → ...ipes/misc/red_dye_block_from_red_dye.json
diff --git a/...ipes/misc/red_dye_from_red_dye_block.json → ...ipes/misc/red_dye_from_red_dye_block.json b/...ipes/misc/red_dye_from_red_dye_block.json → ...ipes/misc/red_dye_from_red_dye_block.json
diff --git a/...isc/red_dye_from_smelting_red_petals.json → ...isc/red_dye_from_smelting_red_petals.json b/...isc/red_dye_from_smelting_red_petals.json → ...isc/red_dye_from_smelting_red_petals.json
diff --git a/.../misc/white_dye_block_from_white_dye.json → .../misc/white_dye_block_from_white_dye.json b/.../misc/white_dye_block_from_white_dye.json → .../misc/white_dye_block_from_white_dye.json
diff --git a/...white_dye_from_smelting_white_petals.json → ...white_dye_from_smelting_white_petals.json b/...white_dye_from_smelting_white_petals.json → ...white_dye_from_smelting_white_petals.json
diff --git a/.../misc/white_dye_from_white_dye_block.json → .../misc/white_dye_from_white_dye_block.json b/.../misc/white_dye_from_white_dye_block.json → .../misc/white_dye_from_white_dye_block.json
diff --git a/...isc/yellow_dye_block_from_yellow_dye.json → ...isc/yellow_dye_block_from_yellow_dye.json b/...isc/yellow_dye_block_from_yellow_dye.json → ...isc/yellow_dye_block_from_yellow_dye.json
diff --git a/...llow_dye_from_smelting_yellow_petals.json → ...llow_dye_from_smelting_yellow_petals.json b/...llow_dye_from_smelting_yellow_petals.json → ...llow_dye_from_smelting_yellow_petals.json
diff --git a/...isc/yellow_dye_from_yellow_dye_block.json → ...isc/yellow_dye_from_yellow_dye_block.json b/...isc/yellow_dye_from_yellow_dye_block.json → ...isc/yellow_dye_from_yellow_dye_block.json
diff --git a/...alis/loot_tables/blocks/black_cactus.json → ...ralis/loot_table/blocks/black_cactus.json b/...alis/loot_tables/blocks/black_cactus.json → ...ralis/loot_table/blocks/black_cactus.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -62,7 +62,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -118,7 +118,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -169,7 +169,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/...loot_tables/blocks/black_cactus_crop.json → .../loot_table/blocks/black_cactus_crop.json b/...loot_tables/blocks/black_cactus_crop.json → .../loot_table/blocks/black_cactus_crop.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -67,7 +67,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -117,7 +117,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -180,7 +180,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -238,7 +238,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -296,7 +296,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/...s/loot_tables/blocks/black_dye_block.json → ...is/loot_table/blocks/black_dye_block.json b/...s/loot_tables/blocks/black_dye_block.json → ...is/loot_table/blocks/black_dye_block.json
diff --git a/...alis/loot_tables/blocks/black_flower.json → ...ralis/loot_table/blocks/black_flower.json b/...alis/loot_tables/blocks/black_flower.json → ...ralis/loot_table/blocks/black_flower.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -62,7 +62,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -118,7 +118,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -169,7 +169,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/...loot_tables/blocks/black_flower_crop.json → .../loot_table/blocks/black_flower_crop.json b/...loot_tables/blocks/black_flower_crop.json → .../loot_table/blocks/black_flower_crop.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -67,7 +67,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -117,7 +117,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -180,7 +180,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -238,7 +238,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -296,7 +296,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/...ralis/loot_tables/blocks/blue_cactus.json → ...oralis/loot_table/blocks/blue_cactus.json b/...ralis/loot_tables/blocks/blue_cactus.json → ...oralis/loot_table/blocks/blue_cactus.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -62,7 +62,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -118,7 +118,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -169,7 +169,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/.../loot_tables/blocks/blue_cactus_crop.json → ...s/loot_table/blocks/blue_cactus_crop.json b/.../loot_tables/blocks/blue_cactus_crop.json → ...s/loot_table/blocks/blue_cactus_crop.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -67,7 +67,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -117,7 +117,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -180,7 +180,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -238,7 +238,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -296,7 +296,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }

diff --git a/...is/loot_tables/blocks/blue_dye_block.json → ...lis/loot_table/blocks/blue_dye_block.json b/...is/loot_tables/blocks/blue_dye_block.json → ...lis/loot_table/blocks/blue_dye_block.json
diff --git a/...ralis/loot_tables/blocks/blue_flower.json → ...oralis/loot_table/blocks/blue_flower.json b/...ralis/loot_tables/blocks/blue_flower.json → ...oralis/loot_table/blocks/blue_flower.json
@@ -22,7 +22,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
@@ -62,7 +62,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -118,7 +118,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }
@@ -169,7 +169,7 @@
                       "predicates": {
                         "minecraft:enchantments": [
                           {
-                            "enchantment": "minecraft:silk_touch",
+                            "enchantments": "minecraft:silk_touch",
                             "levels": {
                               "min": 1
                             }