Port to 1.21.1

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.21.1-0.7.43a] - 2025-01-13
+
+Alpha 1.21.1 release
+The only thing that's missing is the colony integrator - we will add that soon.
+Please report any bugs to github!
+
 ## [1.20.4-0.7.43a] - 2024-12-27
 
 First official Advanced Peripherals 1.20.4 alpha release. Please report any bug to github!

build.gradle

@@ -1,22 +1,22 @@
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 
 import java.text.SimpleDateFormat
-import net.neoforged.gradle.dsl.common.runs.run.Run
 
 plugins {
     id "maven-publish"
     id 'net.darkhax.curseforgegradle' version '1.1.16'
     id 'org.jetbrains.changelog' version '1.2.1'
     id "com.modrinth.minotaur" version "2.+"
-    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id 'net.neoforged.moddev' version '2.+'
     id "com.github.breadmoirai.github-release" version "2.5.2"
     id 'checkstyle'
     id 'java'
+    id 'idea'
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
     withSourcesJar()
 }
@@ -56,32 +56,57 @@ def githubKey = secretEnv["GITHUB_KEY"] ?: System.getenv("GITHUB_KEY")
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
-minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
-runs {
-    // applies to all the run configs below
-    configureEach {
-        systemProperty 'forge.logging.markers', 'REGISTRIES'
+neoForge {
+    // Specify the version of NeoForge to use.
+    version = project.neo_version
 
-        systemProperty 'forge.logging.console.level', 'debug'
-
-        modSource project.sourceSets.main
+    parchment {
+        mappingsVersion = project.parchment_mappings_version
+        minecraftVersion = project.parchment_minecraft_version
     }
 
-    client { run -> setupClientAcc(run) }
+    validateAccessTransformers = true
 
-    server {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-    }
+    runs {
+        // applies to all the run configs below
+        configureEach {
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+
+            logLevel = org.slf4j.event.Level.DEBUG
+        }
+
+        client {
+            client()
+
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        server {
+            server()
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        gameTestServer {
+            type = "gameTestServer"
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        data {
+            data()
+
+            programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+        }
 
-    gameTestServer {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
     }
 
-    data {
-        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 }
+
 repositories {
     mavenCentral()
     maven {
@@ -94,7 +119,7 @@ repositories {
     }
     maven {
         name = "Squiddev maven cct"
-        url = 'https://squiddev.cc/maven/'
+        url = 'https://maven.squiddev.cc'
         content {
             includeGroup("cc.tweaked")
             includeModule("org.squiddev", "Cobalt")
@@ -176,7 +201,6 @@ configurations {
     testModImplementation.extendsFrom(implementation)
     testModImplementation.extendsFrom(testImplementation)
     runtimeClasspath.extendsFrom localRuntime
-
 }
 
 dependencies {
@@ -193,64 +217,38 @@ dependencies {
     // Extended requirements
     // We don't use the api since we need a specific class from mekanism
     compileOnly "mekanism:Mekanism:${mekanism_version}"
-    runtimeOnly "mekanism:Mekanism:${mekanism_version}"
+    //runtimeOnly "mekanism:Mekanism:${mekanism_version}"
 
     // Applied Energistics 2
-    runtimeOnly "appeng:appliedenergistics2-neoforge:${appliedenergistics_version}"
-    compileOnly "appeng:appliedenergistics2-neoforge:${appliedenergistics_version}"
+    runtimeOnly "appeng:appliedenergistics2:${appliedenergistics_version}"
+    compileOnly "appeng:appliedenergistics2:${appliedenergistics_version}"
 
     // Applied Mekanistics
-    runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
+    //runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
     compileOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
 
-    // Curios
-    runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"
-    compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
-
-    // Refined Storage
-    compileOnly "curse.maven:refined-storage-243076:${refinedstorage_version}"
-    runtimeOnly "curse.maven:refined-storage-243076:${refinedstorage_version}"
-
     // AE2 Things
-    //compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
+    compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
     //runtimeOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
 
-    // AE2 Additions
-    //compileOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
-    //runtimeOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
-
-    //implementation "thedarkcolour:kotlinforforge:${kotlinforforge_version}"
-
-    // Botania
-    //compileOnly "vazkii.botania:Botania:${botania_version}"
-    //runtimeOnly "vazkii.botania:Botania:${botania_version}"
-
     // Minecolonies
     // Remove/Comment this section if you want to use runData.
     //runtimeOnly "com.ldtteam:minecolonies:${minecolonies_version}"
     //runtimeOnly "com.ldtteam:structurize:${structurize_version}"
-    //runtimeOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
+    //runtimeOnly "com.ldtteam:domum-ornamentum:${domumornamentum_version}"
     //runtimeOnly "com.ldtteam:blockui:${blockui_version}"
 
-    //compileOnly "com.ldtteam:minecolonies:${minecolonies_version}"
-    //compileOnly "com.ldtteam:structurize:${structurize_version}"
-    //compileOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
-    //compileOnly "com.ldtteam:blockui:${blockui_version}"
+    compileOnly "com.ldtteam:minecolonies:${minecolonies_version}"
+    compileOnly "com.ldtteam:structurize:${structurize_version}"
+    compileOnly "com.ldtteam:domum-ornamentum:${domumornamentum_version}"
+    compileOnly "com.ldtteam:blockui:${blockui_version}"
 
     //Patchouli
-    //runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-FORGE"
-
-    // Create
-    //compileOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
-    //runtimeOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
+    //runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
+    compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
 
     //Powah
-    implementation "curse.maven:powah-633483:${powah_version}"
-    implementation "me.shedaniel.cloth:cloth-config-forge:11.1.106"
-    implementation "dev.architectury:architectury-forge:9.1.10"
-
-    //Removed until fully ported
-    //testImplementation "site.siredvin.ttoolkit:ttoolkit-${minecraft_version}:${ttoolkit_version}"
+    //implementation "curse.maven:powah-633483:${powah_version}"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"
@@ -263,10 +261,6 @@ dependencies {
     // Testing stuff
     // JEI
     implementation "mezz.jei:jei-${jei_version}"
-
-    // Create Crafts & Additions
-    //compileOnly "curse.maven:createaddition-439890:${createadditions_version}"
-    //runtimeOnly "curse.maven:createaddition-439890:${createadditions_version}"
 }
 
 
@@ -321,19 +315,16 @@ tasks.withType(ProcessResources).configureEach {
                              mod_id                    : mod_id,
                              version                   : version,
                              cc_version                : cc_version,
-                             curios_version            : curios_version,
                              minecolonies_version      : minecolonies_version,
                              appliedenergistics_version: appliedenergistics_version,
                              patchouli_version         : patchouli_version,
-                             refinedstorage_version    : refinedstorage_version,
-                             botania_version           : botania_version,
                              mekanism_version          : mekanism_version,
                              ae2things_version         : ae2things_version,
                              powah_version             : powah_version,]
 
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml']) {
+    filesMatching(['META-INF/neoforge.mods.toml']) {
         expand replaceProperties
     }
 }
@@ -413,37 +404,13 @@ modrinth {
     }
 }
 
-// Stolen from mekanism
-static void setupClientAcc(Run run) {
-    //The below if statements are to add args to your gradle.properties file in user home
-    // (DO NOT add them directly to the gradle.properties file for this project)
-    // Setting the below properties allows use of your normal Minecraft account in the
-    // dev environment including having your skin load. Each property also has a comment
-    // explaining what information to set the value to/format it expects
-    // One thing to note is because of the caching that goes on, after changing these
-    // variables, you need to refresh the project and rerun genIntellijRuns/genEclipseRuns
-    if (run.project.hasProperty('mc_uuid')) {
-        //Your uuid without any dashes in the middle
-        run.programArguments('--uuid', (String) run.project.property('mc_uuid'))
-    }
-    if (run.project.hasProperty('mc_username')) {
-        //Your username/display name, this is the name that shows up in chat
-        // Note: This is not your email, even if you have a Mojang account
-        run.programArguments('--username', (String) run.project.property('mc_username'))
-    }
-    if (run.project.hasProperty('mc_accessToken')) {
-        //Your access token, you can find it in your '.minecraft/launcher_accounts.json' file
-        run.programArguments('--accessToken', (String) run.project.property('mc_accessToken'))
-    }
-}
-
 publishing {
     publications { PublicationContainer publicationContainer ->
         publicationContainer.register("maven", MavenPublication) { MavenPublication publication ->
             publication.from((SoftwareComponent) components.java)
             publication.groupId = project.group
             publication.version = isSnapshotVersion ? "${minecraft_version}-${version}-${project.teamcityBuild}" : "${minecraft_version}-${version}"
-            publication.artifactId =  isSnapshotVersion ? "advancedperipherals-snapshots" : "advancedperipherals"
+            publication.artifactId = isSnapshotVersion ? "advancedperipherals-snapshots" : "advancedperipherals"
             publication.artifacts = [jar, sourcesJar]
             publication.pom {
                 name.set("AdvancedPeripherals")

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.logging.level=info
 
 # Minecraft related
 mod_id=advancedperipherals
-minecraft_version=1.20.4
-neo_version=20.4.231
-loader_version=20
+minecraft_version=1.21.1
+neo_version=21.1.93
+parchment_minecraft_version=1.21.1
+parchment_mappings_version=2024.11.17
+loader_version=4
 mod_version=0.7.43a
 release_type=alpha
-neogradle.subsystems.parchment.minecraftVersion=1.20.4
-neogradle.subsystems.parchment.mappingsVersion=2024.04.14
 jb_annotations=21.0.1
 
 # Test dependencies
@@ -21,29 +21,22 @@ kotlinx_coroutines_version=1.6.0-RC3
 ttoolkit_version=0.1.3
 
 # Mod dependencies
-cc_version=1.110.2
-curios_version=7.4.3+1.20.4
-minecolonies_version=1.20.1-1.1.472-BETA
-appliedenergistics_version=17.13.0-beta
-patchouli_version=1.20.1-84
-refinedstorage_version=5165548
-botania_version=1.20.1-443-FORGE
-create_version=0.5.1.f-27
-createca_version=5099757
-mekanism_version=1.20.4-10.5.20.41
-ae2things_version=4616683
+cc_version=1.114.2
+minecolonies_version=1.1.846-1.21.1-snapshot
+appliedenergistics_version=19.1.2-beta
+patchouli_version=1.21-87
+mekanism_version=1.21.1-10.7.8.70
+ae2things_version=5637783
 powah_version=4638301
-ae2additions_version=5077081
-kotlinforforge_version=4.10.0
-appliedmekanistics_version=5294358
+appliedmekanistics_version=5978711
 
 # Mod dependencies which are needed for other mods
 # For minecolonies
-structurize_version=1.20.1-1.0.662-BETA
-multipiston_version=1.20-1.2.30-ALPHA
-blockui_version=1.20.1-0.0.101-ALPHA
-domumornamentum_version=1.20-1.0.150-BETA
+structurize_version=1.0.755-1.21.1-snapshot
+multipiston_version=1.2.51-1.21.1-snapshot
+blockui_version=1.0.192-1.21.1-snapshot
+domumornamentum_version=1.0.204-1.21.1-snapshot
 
 # Mod dependencies for testing stuff(Only used in the dev environment)
-jei_version=1.20.4-neoforge:17.3.1.5
+jei_version=1.21.1-neoforge:19.19.6.235
 createadditions_version=5099752

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -0,0 +1,17 @@
+// 1.21.1	2025-01-13T17:34:41.7633686	Registries
+b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrade/chatty_pocket.json
+d4647159c2f2693a9c5e8d12bf740635751d29a8 data/advancedperipherals/computercraft/pocket_upgrade/environment_pocket.json
+8216a0a7d8ebe3ae738c8fc3626df25eb0a2e07a data/advancedperipherals/computercraft/pocket_upgrade/geoscanner_pocket.json
+a38aa83593f7ad0ace98e01bb3b5f06f272ef734 data/advancedperipherals/computercraft/pocket_upgrade/player_pocket.json
+b8f19ae0fb5bb898facc08e3787e0f96c8211881 data/advancedperipherals/computercraft/turtle_upgrade/chatty_turtle.json
+fe98c60e7d61139aacf2d0872873e610aac8a37b data/advancedperipherals/computercraft/turtle_upgrade/chunky_turtle.json
+ae619da638ad89d7302d832d6c09e2c87401c539 data/advancedperipherals/computercraft/turtle_upgrade/compass_turtle.json
+a25b955d6db4ad48d43255d48d05c7f3acd60ea3 data/advancedperipherals/computercraft/turtle_upgrade/end_automata.json
+98d71a2e17f3d30bbb76c1ba2f94a1cd610c2cd2 data/advancedperipherals/computercraft/turtle_upgrade/environment_turtle.json
+a3b3e4cbaedee3a929a4c9775e4f1a4cbd292b42 data/advancedperipherals/computercraft/turtle_upgrade/geoscanner_turtle.json
+522bb2a1afb9f2be97af7cf65cd9aa159d76d13a data/advancedperipherals/computercraft/turtle_upgrade/husbandry_automata.json
+c9b2df2d4fed11f60a8e6f8da77b2fa53dd13572 data/advancedperipherals/computercraft/turtle_upgrade/overpowered_end_automata.json
+42fc2b9a2601ef44d617cb18302c2c4fff31d282 data/advancedperipherals/computercraft/turtle_upgrade/overpowered_husbandry_automata.json
+fa7743922ef6b4dd3e633f2857e4047d533f13b5 data/advancedperipherals/computercraft/turtle_upgrade/overpowered_weak_automata.json
+4054c59ceb099f17c4555fd5f36b2f8b4109f624 data/advancedperipherals/computercraft/turtle_upgrade/player_turtle.json
+c8059a2717cfac5b02898658c4d2d52fbd5710d4 data/advancedperipherals/computercraft/turtle_upgrade/weak_automata.json

src/generated/resources/.cache/2db41954e490230d51b10affff25ee2ee27b8d5b

@@ -1,2 +1,2 @@
-// 1.20.4	2024-12-22T16:09:31.6895785	AP POI Type Tags
+// 1.21.1	2025-01-13T17:28:09.7081276	AP POI Type Tags
 d3d6b837660a4e213f287ad9d11e12368b90cd8e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

src/generated/resources/.cache/2f719b8031aed5e605ed8d6694b19245ca45c6ca

@@ -1,2 +1,2 @@
-// 1.20.4	2024-12-22T16:09:31.694585	Languages: en_us for mod: advancedperipherals
-d669461c50102af6d4058086e2f12af8b0020157 assets/advancedperipherals/lang/en_us.json
+// 1.21.1	2025-01-13T17:28:09.7116313	Languages: en_us for mod: advancedperipherals
+b733229a45f64a6500a00da10265bc71b8320229 assets/advancedperipherals/lang/en_us.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,13 +1,12 @@
-// 1.20.4	2024-12-22T16:09:31.6905785	Loot Tables
-fdf4d9f8220d3a5207f8e4334bff2f06cd203b04 data/advancedperipherals/loot_tables/blocks/block_reader.json
-8c3dba853066f5f8da0a27b0783e68fc33e8bebc data/advancedperipherals/loot_tables/blocks/chat_box.json
-765df45ccaef4e908a480da9cb6f13ab1b4d7545 data/advancedperipherals/loot_tables/blocks/energy_detector.json
-9144fbb590a4c6e9cf7b8ef87fc80faf321c7e16 data/advancedperipherals/loot_tables/blocks/environment_detector.json
-4e184ec10657d1dc11ee7da33f244b2e23d61460 data/advancedperipherals/loot_tables/blocks/geo_scanner.json
-266e98d8eeec6ef465832cac664e5ab05bca96af data/advancedperipherals/loot_tables/blocks/inventory_manager.json
-ee86218933f0da283ae1dd6617d74ed41a04575b data/advancedperipherals/loot_tables/blocks/me_bridge.json
-6aec9d25423531f9236266e2535d6c4633129935 data/advancedperipherals/loot_tables/blocks/nbt_storage.json
-e9ed113da52cddcce17768d0999d4f9aefb4cfa7 data/advancedperipherals/loot_tables/blocks/peripheral_casing.json
-33c81013355b11d7c8630c811ddd80232d3c1c7c data/advancedperipherals/loot_tables/blocks/player_detector.json
-e88dae55b3850e66ce81752eb060b1e0fe8f707e data/advancedperipherals/loot_tables/blocks/redstone_integrator.json
-dfb4e28d40828f2ef96dc9bd7b2a67e40fcd0c78 data/advancedperipherals/loot_tables/blocks/rs_bridge.json
+// 1.21.1	2025-01-13T17:28:09.7091279	Loot Tables
+9b54955770745d55de988a86cbd08aa9ae23ff86 data/advancedperipherals/loot_table/blocks/block_reader.json
+d4f1bc579f83dc67ce9f94d35926d34b8894c990 data/advancedperipherals/loot_table/blocks/chat_box.json
+6da40a0a9d46855710272fe9d40bb5a7f0219ff2 data/advancedperipherals/loot_table/blocks/energy_detector.json
+85cd3af52c824db96403e6fceea480bceda3a186 data/advancedperipherals/loot_table/blocks/environment_detector.json
+7f607d7476252b89a57eb4c227cc69f4f28995e3 data/advancedperipherals/loot_table/blocks/geo_scanner.json
+fddf157b52a210846f5737dcc39a16b7ab6a587a data/advancedperipherals/loot_table/blocks/inventory_manager.json
+ae62bfa75e39a59374602c8a87cc2afe8b4923dd data/advancedperipherals/loot_table/blocks/me_bridge.json
+51ceb7b82ba8424a2c6f03f280c14d1c2d0d18d7 data/advancedperipherals/loot_table/blocks/nbt_storage.json
+fa56de9a073f32ab8a65b5f17c57f360a157b5c1 data/advancedperipherals/loot_table/blocks/peripheral_casing.json
+d61b1c54dd6da8f0213d5eb8a5b40d78bff5ba90 data/advancedperipherals/loot_table/blocks/player_detector.json
+6bad9bed7baa7af4b5ca3cae7c4cb8d47dc7b593 data/advancedperipherals/loot_table/blocks/redstone_integrator.json