Migration to 1.20.6 (#11)

Co-authored-by: TheMCLoveMan <68924107+TheMCLoveMan@users.noreply.github.com>

.github/workflows/crowdin_download.yml

@@ -11,7 +11,7 @@ jobs:
   crowdin:
     uses: TheMCBrothers/.github/.github/workflows/crowdin_download.yml@main
     with:
-      pull_request_base_branch_name: '1.20.4'
+      pull_request_base_branch_name: '1.20.6'
     secrets:
       GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       CROWDIN_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/crowdin_upload.yml

@@ -3,7 +3,7 @@ name: Crowdin Upload
 on:
   push:
     paths: [ 'src/generated/resources/assets/*/lang/**' ]
-    branches: [ '1.20.4' ]
+    branches: [ '1.20.6' ]
   workflow_dispatch:
 
 jobs:

.github/workflows/java_ci.yml

@@ -17,3 +17,5 @@ permissions:
 jobs:
   ci:
     uses: TheMCBrothers/.github/.github/workflows/mod_ci.yml@main
+    with:
+      java_version: '21'

.github/workflows/publish.yml

@@ -12,6 +12,8 @@ permissions:
 jobs:
   publish:
     uses: TheMCBrothers/.github/.github/workflows/mod_publish_unified.yml@main
+    with:
+      java_version: '21'
     secrets:
       CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
       MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.96'
+    id 'net.neoforged.gradle.userdev' version '7.0.105'
     id 'me.shedaniel.unified-publishing' version '0.1.+'
 }
 
@@ -19,8 +19,8 @@ base {
     archivesName = archive_base
 }
 
-// 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 in 1.20.5+, so your mod should target Java 21.
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -80,7 +80,7 @@ tasks.withType(ProcessResources).configureEach {
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml']) {
+    filesMatching(['META-INF/neoforge.mods.toml']) {
         expand replaceProperties + [project: project]
     }
 }
@@ -149,7 +149,7 @@ unifiedPublishing {
                 token = curseforgeToken
                 id = curse_project
                 changelog = changes
-                gameVersions.addAll 'Java 17'
+                gameVersions.addAll 'Java 21'
             }
         }
 

changelog.md

@@ -1,14 +1,3 @@
-## 1.3.0
-- Added block loot tables
-- Added translations
-
-## 1.2.0
-- Added recipes for materials
-
-## 1.1.0
-- Added dummy hammer item
-
 ## 1.0.0
-- Migration to NeoForge
-- Updated to 1.20.4
+- Updated to 1.20.6
 

gradle.properties

@@ -8,27 +8,27 @@ org.gradle.debug=false
 mod_id=usefulfoundation
 mod_name=Useful Foundation
 mod_license=MIT License
-mod_version=1.3.0
+mod_version=1.0.0
 mod_group_id=net.themcbrothers
 mod_authors=TheMCBrothers
 mod_description=It adds a lot of new materials and ores.
 
 # Minecraft
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.21)
+minecraft_version=1.20.6
+minecraft_version_range=[1.20.6,1.21)
 
 # NeoForge
-neo_version=20.4.167
-neo_version_range=[20.4,)
-loader_version_range=[2,)
+neo_version=20.6.18-beta
+neo_version_range=[20.6,)
+loader_version_range=[3,)
 
 ## Mappings
-neogradle.subsystems.parchment.minecraftVersion=1.20.3
-neogradle.subsystems.parchment.mappingsVersion=2023.12.31
+neogradle.subsystems.parchment.minecraftVersion=1.20.6
+neogradle.subsystems.parchment.mappingsVersion=2024.05.01
 
 # Dependencies
-lib_version=1.20.4-6.1.0
-lib_version_range=[1.20.4-6.1.0,)
+lib_version=1.20.6-7.0.0-SNAPSHOT
+lib_version_range=[1.20.5-7.0.0,)
 
 # Publishing
 archive_base=useful-foundation

gradle/wrapper/gradle-wrapper.properties

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

src/generated/resources/data/c/tags/blocks/ores.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "#c:ores/aluminum",
+    "#c:ores/lead",
+    "#c:ores/nickel",
+    "#c:ores/platinum",
+    "#c:ores/silver",
+    "#c:ores/tin",
+    "#c:ores/uranium"
+  ]
+}

src/generated/resources/data/c/tags/blocks/storage_blocks.json

@@ -0,0 +1,24 @@
+{
+  "values": [
+    "#c:storage_blocks/aluminum",
+    "#c:storage_blocks/bronze",
+    "#c:storage_blocks/electrum",
+    "#c:storage_blocks/enderium",
+    "#c:storage_blocks/invar",
+    "#c:storage_blocks/lead",
+    "#c:storage_blocks/nickel",
+    "#c:storage_blocks/platinum",
+    "#c:storage_blocks/signalum",
+    "#c:storage_blocks/silver",
+    "#c:storage_blocks/steel",
+    "#c:storage_blocks/tin",
+    "#c:storage_blocks/uranium",
+    "#c:storage_blocks/raw_aluminum",
+    "#c:storage_blocks/raw_lead",
+    "#c:storage_blocks/raw_nickel",
+    "#c:storage_blocks/raw_platinum",
+    "#c:storage_blocks/raw_silver",
+    "#c:storage_blocks/raw_tin",
+    "#c:storage_blocks/raw_uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/dusts.json

@@ -0,0 +1,21 @@
+{
+  "values": [
+    "#c:dusts/aluminum",
+    "#c:dusts/bronze",
+    "#c:dusts/copper",
+    "#c:dusts/diamond",
+    "#c:dusts/electrum",
+    "#c:dusts/enderium",
+    "#c:dusts/gold",
+    "#c:dusts/invar",
+    "#c:dusts/iron",
+    "#c:dusts/lead",
+    "#c:dusts/nickel",
+    "#c:dusts/platinum",
+    "#c:dusts/signalum",
+    "#c:dusts/silver",
+    "#c:dusts/steel",
+    "#c:dusts/tin",
+    "#c:dusts/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/gears.json

@@ -0,0 +1,21 @@
+{
+  "values": [
+    "#c:gears/aluminum",
+    "#c:gears/bronze",
+    "#c:gears/copper",
+    "#c:gears/diamond",
+    "#c:gears/electrum",
+    "#c:gears/enderium",
+    "#c:gears/gold",
+    "#c:gears/invar",
+    "#c:gears/iron",
+    "#c:gears/lead",
+    "#c:gears/nickel",
+    "#c:gears/platinum",
+    "#c:gears/signalum",
+    "#c:gears/silver",
+    "#c:gears/steel",
+    "#c:gears/tin",
+    "#c:gears/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/ingots.json

@@ -0,0 +1,17 @@
+{
+  "values": [
+    "#c:ingots/aluminum",
+    "#c:ingots/bronze",
+    "#c:ingots/electrum",
+    "#c:ingots/enderium",
+    "#c:ingots/invar",
+    "#c:ingots/lead",
+    "#c:ingots/nickel",
+    "#c:ingots/platinum",
+    "#c:ingots/signalum",
+    "#c:ingots/silver",
+    "#c:ingots/steel",
+    "#c:ingots/tin",
+    "#c:ingots/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/nuggets.json

@@ -0,0 +1,18 @@
+{
+  "values": [
+    "#c:nuggets/aluminum",
+    "#c:nuggets/bronze",
+    "#c:nuggets/copper",
+    "#c:nuggets/electrum",
+    "#c:nuggets/enderium",
+    "#c:nuggets/invar",
+    "#c:nuggets/lead",
+    "#c:nuggets/nickel",
+    "#c:nuggets/platinum",
+    "#c:nuggets/signalum",
+    "#c:nuggets/silver",
+    "#c:nuggets/steel",
+    "#c:nuggets/tin",
+    "#c:nuggets/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/ores.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "#c:ores/aluminum",
+    "#c:ores/lead",
+    "#c:ores/nickel",
+    "#c:ores/platinum",
+    "#c:ores/silver",
+    "#c:ores/tin",
+    "#c:ores/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/plates.json

@@ -0,0 +1,21 @@
+{
+  "values": [
+    "#c:plates/aluminum",
+    "#c:plates/bronze",
+    "#c:plates/copper",
+    "#c:plates/diamond",
+    "#c:plates/electrum",
+    "#c:plates/enderium",
+    "#c:plates/gold",
+    "#c:plates/invar",
+    "#c:plates/iron",
+    "#c:plates/lead",
+    "#c:plates/nickel",
+    "#c:plates/platinum",
+    "#c:plates/signalum",
+    "#c:plates/silver",
+    "#c:plates/steel",
+    "#c:plates/tin",
+    "#c:plates/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/raw_materials.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "#c:raw_materials/aluminum",
+    "#c:raw_materials/lead",
+    "#c:raw_materials/nickel",
+    "#c:raw_materials/platinum",
+    "#c:raw_materials/silver",
+    "#c:raw_materials/tin",
+    "#c:raw_materials/uranium"
+  ]
+}

src/generated/resources/data/c/tags/items/storage_blocks.json

@@ -0,0 +1,24 @@
+{
+  "values": [
+    "#c:storage_blocks/aluminum",
+    "#c:storage_blocks/bronze",
+    "#c:storage_blocks/electrum",
+    "#c:storage_blocks/enderium",
+    "#c:storage_blocks/invar",
+    "#c:storage_blocks/lead",
+    "#c:storage_blocks/nickel",
+    "#c:storage_blocks/platinum",
+    "#c:storage_blocks/signalum",
+    "#c:storage_blocks/silver",
+    "#c:storage_blocks/steel",
+    "#c:storage_blocks/tin",
+    "#c:storage_blocks/uranium",
+    "#c:storage_blocks/raw_aluminum",
+    "#c:storage_blocks/raw_lead",
+    "#c:storage_blocks/raw_nickel",
+    "#c:storage_blocks/raw_platinum",
+    "#c:storage_blocks/raw_silver",
+    "#c:storage_blocks/raw_tin",
+    "#c:storage_blocks/raw_uranium"
+  ]
+}