1.21.1 port

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.152'
+    id 'net.neoforged.gradle.userdev' version '7.0.165'
 }
 
 tasks.named('wrapper', Wrapper).configure {

gradle.properties

@@ -6,28 +6,28 @@ 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.21
-neogradle.subsystems.parchment.mappingsVersion=2024.06.23
+neogradle.subsystems.parchment.mappingsVersion=2024.07.28
 # 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.21
+minecraft_version=1.21.1
 # 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.21,1.21.1)
+minecraft_version_range=[1.21.1,1.21.2)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.42-beta
+neo_version=21.1.47
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.0.40-beta,)
+neo_version_range=[21.1.47,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[4,)
 
 ## Dep Properties
 
 # Jade version
-jade_version=5444008
+jade_version=5706149
 # JEI version
-jei_version=5466551
+jei_version=5763011
 
 ## Mod Properties
 
@@ -39,7 +39,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=16.1.0
+mod_version=17.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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

src/main/java/com/luxtracon/floralis/block/DyeBlock.java

@@ -16,7 +16,7 @@ public DyeBlock(Properties pProperties) {
 	}
 
 	@Override
-	protected MapCodec<DyeBlock> codec() {
+	public MapCodec<DyeBlock> codec() {
 		return DyeBlock.CODEC;
 	}
 }

src/main/java/com/luxtracon/floralis/data/FloralisRecipes.java

@@ -22,7 +22,7 @@ public FloralisRecipes(PackOutput pOutput, CompletableFuture<HolderLookup.Provid
 	}
 
 	@Override
-	protected void buildRecipes(RecipeOutput pOutput) {
+	public void buildRecipes(RecipeOutput pOutput) {
 		this.craftingRecipe(pOutput, FloralisItems.WHITE_DYE_BLOCK.get(), Items.WHITE_DYE);
 		this.craftingRecipe(pOutput, FloralisItems.LIGHT_GRAY_DYE_BLOCK.get(), Items.LIGHT_GRAY_DYE);
 		this.craftingRecipe(pOutput, FloralisItems.GRAY_DYE_BLOCK.get(), Items.GRAY_DYE);

src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java

@@ -31,7 +31,7 @@ public FloralisBlockTags(PackOutput output, CompletableFuture<HolderLookup.Provi
 	}
 
 	@Override
-	protected void addTags(HolderLookup.Provider pProvider) {
+	public void addTags(HolderLookup.Provider pProvider) {
 		this.tag(BlockTags.MINEABLE_WITH_SHOVEL)
 			.add(FloralisBlocks.WHITE_DYE_BLOCK.get())
 			.add(FloralisBlocks.LIGHT_GRAY_DYE_BLOCK.get())

src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java

@@ -27,16 +27,14 @@
 @ParametersAreNonnullByDefault
 
 public class FloralisItemTags extends ItemTagsProvider {
-	public static final TagKey<Item> FERTILIZER = FloralisItemTags.cTag("fertilizer");
-
 	public static final TagKey<Item> BIOREACTOR = FloralisItemTags.industrialforegoingTag("bioreactor");
 
 	public FloralisItemTags(PackOutput pOutput, CompletableFuture<HolderLookup.Provider> pProvider, CompletableFuture<TagLookup<Block>> pTags, String pId, ExistingFileHelper pHelper) {
 		super(pOutput, pProvider, pTags, pId, pHelper);
 	}
 
 	@Override
-	protected void addTags(HolderLookup.Provider pProvider) {
+	public void addTags(HolderLookup.Provider pProvider) {
 		this.tag(Tags.Items.STORAGE_BLOCKS)
 			.add(FloralisItems.WHITE_DYE_BLOCK.get())
 			.add(FloralisItems.LIGHT_GRAY_DYE_BLOCK.get())
@@ -143,7 +141,7 @@ protected void addTags(HolderLookup.Provider pProvider) {
 			.add(FloralisItems.PINK_PETALS.get())
 			.add(FloralisItems.PLANT_FIBERS.get());
 
-		this.tag(FloralisItemTags.FERTILIZER)
+		this.tag(Tags.Items.FERTILIZERS)
 			.add(FloralisItems.PLANT_FIBERS.get());
 	}