1.20.5 port and data gen

.gitignore

@@ -24,3 +24,4 @@ runs
 run-data
 
 repo
+src/generated/resources/.cache

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.97'
+    id 'net.neoforged.gradle.userdev' version '7.0.105'
 }
 
 version = mod_version
@@ -24,8 +24,8 @@ base {
     archivesName = mod_id
 }
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+// 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')
 
@@ -94,10 +94,6 @@ dependencies {
     // And its provides the option to then use net.minecraft as the group, and one of; client, server or joined as the module name, plus the game version as version.
     // For all intends and purposes: You can treat this dependency as if it is a normal library you would use.
     implementation "net.neoforged:neoforge:${neo_version}"
-    implementation "curse.maven:immersive-engineering-231951:${immersive_engineering_version}"
-    implementation "curse.maven:jade-324717:${jade_version}"
-    implementation "curse.maven:jei-238222:${jei_version}"
-    implementation "curse.maven:mekanism-268560:${mekanism_version}"
 
     // Example optional mod dependency with JEI
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
@@ -142,7 +138,7 @@ tasks.withType(ProcessResources).configureEach {
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml']) {
+    filesMatching(['META-INF/neoforge.mods.toml']) {
         expand replaceProperties
     }
 }

gradle.properties

@@ -1,32 +1,27 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-#org.gradle.jvmargs=
+org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 org.gradle.debug=false
 
 #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.20.3
-neogradle.subsystems.parchment.mappingsVersion=2023.12.31
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.04.14
 # 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.4
+minecraft_version=1.20.5
 # 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.4,1.21)
+minecraft_version_range=[1.20.5,1.21)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=20.4.235
+neo_version=20.5.21-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[20.4,)
+neo_version_range=[20.5,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[2,)
 
-immersive_engineering_version=5306499
-jade_version=5109393
-jei_version=5306217
-mekanism_version=5316226
-
 ## Mod Properties
 
 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
@@ -37,7 +32,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=13.0.0
+mod_version=14.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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/resources/data/forge/tags/blocks/storage_blocks.json → src/generated/resources/data/c/tags/blocks/storage_blocks.json

@@ -1,7 +1,5 @@
 {
-  "replace": false,
   "values": [
-    "floralis:plant_fibers_block",
     "floralis:white_dye_block",
     "floralis:light_gray_dye_block",
     "floralis:gray_dye_block",
@@ -17,6 +15,7 @@
     "floralis:blue_dye_block",
     "floralis:purple_dye_block",
     "floralis:magenta_dye_block",
-    "floralis:pink_dye_block"
+    "floralis:pink_dye_block",
+    "floralis:plant_fibers_block"
   ]
 }

src/main/resources/data/forge/tags/items/fertilizer.json → src/generated/resources/data/c/tags/items/fertilizer.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "floralis:plant_fibers"
   ]

src/main/resources/data/forge/tags/items/seeds.json → src/generated/resources/data/c/tags/items/seeds.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "floralis:white_flower_seeds",
     "floralis:light_gray_flower_seeds",

src/main/resources/data/forge/tags/items/storage_blocks.json → src/generated/resources/data/c/tags/items/storage_blocks.json

@@ -1,7 +1,5 @@
 {
-  "replace": false,
   "values": [
-    "floralis:plant_fibers_block",
     "floralis:white_dye_block",
     "floralis:light_gray_dye_block",
     "floralis:gray_dye_block",
@@ -17,6 +15,7 @@
     "floralis:blue_dye_block",
     "floralis:purple_dye_block",
     "floralis:magenta_dye_block",
-    "floralis:pink_dye_block"
+    "floralis:pink_dye_block",
+    "floralis:plant_fibers_block"
   ]
 }

src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_black_dye": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:black_dye"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:black_dye_block_from_black_dye"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_black_dye"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:black_dye_block_from_black_dye"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_black_dye_block": {
+      "conditions": {
+        "items": [
+          {
+            "items": "floralis:black_dye_block"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:black_dye_from_black_dye_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_black_dye_block"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:black_dye_from_black_dye_block"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_black_petals": {
+      "conditions": {
+        "items": [
+          {
+            "items": "floralis:black_petals"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:black_dye_from_smelting_black_petals"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_black_petals"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:black_dye_from_smelting_black_petals"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_blue_dye": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:blue_dye"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:blue_dye_block_from_blue_dye"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_blue_dye"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:blue_dye_block_from_blue_dye"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_blue_dye_block": {
+      "conditions": {
+        "items": [
+          {
+            "items": "floralis:blue_dye_block"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:blue_dye_from_blue_dye_block"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_blue_dye_block"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:blue_dye_from_blue_dye_block"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_blue_petals": {
+      "conditions": {
+        "items": [
+          {
+            "items": "floralis:blue_petals"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:blue_dye_from_smelting_blue_petals"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_blue_petals"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:blue_dye_from_smelting_blue_petals"
+    ]
+  }
+}

src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_brown_dye": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:brown_dye"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "floralis:brown_dye_block_from_brown_dye"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_brown_dye"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "floralis:brown_dye_block_from_brown_dye"
+    ]
+  }
+}