1.21 port

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Setup JDK 21
+      - name: Setup JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Build with Gradle

build.gradle

@@ -3,23 +3,23 @@ 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.145'
+}
+
+tasks.named('wrapper', Wrapper).configure {
+    // Define wrapper values here so as to not have to always do so when updating gradlew.properties.
+    // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
+    // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
+    // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
+    // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 version = mod_version
 group = mod_group_id
 
 repositories {
     mavenLocal()
-
-    maven {
-        name = "Jared's maven"
-        url = "https://maven.blamejared.com/"
-    }
-    maven {
-        name = "ModMaven"
-        url = "https://modmaven.dev"
-    }
 }
 
 base {

gradle.properties

@@ -6,16 +6,16 @@ org.gradle.debug=false
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
 neogradle.subsystems.parchment.minecraftVersion=1.20.6
 neogradle.subsystems.parchment.mappingsVersion=2024.05.01
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6]
-neo_version=20.6.80-beta
-neo_version_range=[20.6,)
-loader_version_range=[2,)
-jei_version=17.3.0.51
+minecraft_version=1.21
+minecraft_version_range=[1.21,1.21.1)
+neo_version=21.0.42-beta
+neo_version_range=[21.0.42-beta,)
+loader_version_range=[4,)
+jei_version=19.0.0.11
 mod_id=jafohana
 mod_name=Just a Few Ohana
 mod_license=LGPL-3.0
-mod_version=9.0.3
+mod_version=10.0.0
 mod_group_id=com.github.mechalopa.jafohana
 mod_authors=Mechalopa
 mod_description=More new flowers.

src/main/java/com/github/mechalopa/jafohana/util/ModTags.java

@@ -28,11 +28,11 @@ public static final class EntityTypeTags
 
 	private static TagKey<Block> createBlockTag(String name)
 	{
-		return TagKey.create(Registries.BLOCK, new ResourceLocation(JAFOhana.MODID, name));
+		return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(JAFOhana.MODID, name));
 	}
 
 	private static TagKey<EntityType<?>> createEntityTypeTag(String name)
 	{
-		return TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation(JAFOhana.MODID, name));
+		return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath(JAFOhana.MODID, name));
 	}
 }

src/main/resources/META-INF/neoforge.mods.toml

@@ -6,7 +6,7 @@ issueTrackerURL="https://github.com/Mechalopa/Just-a-Few-Ohana/issues"
 modId="${mod_id}"
 version="${mod_version}"
 displayName="${mod_name}"
-updateJSONURL="https://github.com/Mechalopa/Just-a-Few-Ohana/raw/neoforge-1.20.4/update.json"
+updateJSONURL="https://github.com/Mechalopa/Just-a-Few-Ohana/raw/neoforge-1.21/update.json"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/just-a-few-ohana"
 #logoFile="logo.png"
 credits="${mod_authors}"

update.json

@@ -1,7 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/just-a-few-ohana",
   "promos": {
-    "1.20.6-latest": "9.0.3",
-    "1.20.6-recommended": "9.0.3"
+    "1.21-latest": "10.0.0",
+    "1.21-recommended": "10.0.0"
   }
 }