diff --git a/.gitignore b/.gitignore index 12746ae..22b1d0e 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,23 @@ !/libs/RF-API.zip /secret.json +# Nested local tooling and generated output +AGENTS.md +AGENT.md +CLAUDE.md +GEMINI.md +ARCHITECT.md +agent-notes/ +.codex/ +.agent/ +.agents/ +.claude/ +.gemini/ +.cursor/ +agent-*.md +codex-*.md +*.log +*.class +__pycache__/ +*.pyc /.DS_Store diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a599c6d..a50156f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +Test rig updates (no Power Advantage version change) + +- Use the repaired Steam and Electric drill builds in the 1.10 test profiles. +- Keep generated logs and local tooling files out of Git. + Power Advantage 2.4.3.110021 - Move the implementation namespace to zone.moddev.mc.poweradvantage while preserving runtime identities. diff --git a/README.md b/README.md index 309874e..e5d8c91 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,9 @@ The source-controlled [Advantage Works test rig](test-rig/README.md) turns those ## Building Minecraft 1.10.2 +The rig profiles use Steam and Electric Advantage `2.2.5.110021`, which retain unfinished +drill work after a restart. This profile update does not change Power Advantage gameplay or its version. + The `master-1.10.2` build uses ForgeGradle 7.0.34 and Gradle 9.6.1. Run Gradle with Java 17; Gradle resolves the Java 8 toolchain used for compilation. Build the pinned OreSpawn commit `5a50df1158e948c8db55814e819090b34c12d765` first, or pass its deobf jar with `-PoreSpawnDeobfJar=`. diff --git a/test-rig/profiles/dev-core-apocalyptic.json b/test-rig/profiles/dev-core-apocalyptic.json index 0dc8d3d..2826bcb 100644 --- a/test-rig/profiles/dev-core-apocalyptic.json +++ b/test-rig/profiles/dev-core-apocalyptic.json @@ -20,17 +20,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021-deobf.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.4.110021-deobf.jar", - "sha256": "5CD8F115F929C0F408B3520A585A1B5E39DAEA1BE7BDB75E08A7825C8CC57E43" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021-deobf.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.110021-deobf.jar", + "sha256": "B5247840473DE939234D83B61612B42B2398D79036101CD17ADA5AEA08B8A63F" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021-deobf.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.4.110021-deobf.jar", - "sha256": "DE4B48C6C939583CFA68BEB6D375AF841303897CDCB0F9B95E59BB97F660FF84" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021-deobf.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.110021-deobf.jar", + "sha256": "2E1ED596049D891C3A41ECC9DFE8979E39DED56651B8DE6DB2A9A4709F5A1AF9" } ] } diff --git a/test-rig/profiles/dev-core-tech-progression.json b/test-rig/profiles/dev-core-tech-progression.json index 4dbcb56..86b202d 100644 --- a/test-rig/profiles/dev-core-tech-progression.json +++ b/test-rig/profiles/dev-core-tech-progression.json @@ -20,17 +20,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021-deobf.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.4.110021-deobf.jar", - "sha256": "5CD8F115F929C0F408B3520A585A1B5E39DAEA1BE7BDB75E08A7825C8CC57E43" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021-deobf.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.110021-deobf.jar", + "sha256": "B5247840473DE939234D83B61612B42B2398D79036101CD17ADA5AEA08B8A63F" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021-deobf.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.4.110021-deobf.jar", - "sha256": "DE4B48C6C939583CFA68BEB6D375AF841303897CDCB0F9B95E59BB97F660FF84" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021-deobf.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.110021-deobf.jar", + "sha256": "2E1ED596049D891C3A41ECC9DFE8979E39DED56651B8DE6DB2A9A4709F5A1AF9" } ] } diff --git a/test-rig/profiles/dev-core.json b/test-rig/profiles/dev-core.json index 56a0499..c218a50 100644 --- a/test-rig/profiles/dev-core.json +++ b/test-rig/profiles/dev-core.json @@ -19,17 +19,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021-deobf.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.4.110021-deobf.jar", - "sha256": "5CD8F115F929C0F408B3520A585A1B5E39DAEA1BE7BDB75E08A7825C8CC57E43" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021-deobf.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs-dev/SteamAdvantage-2.2.5.110021-deobf.jar", + "sha256": "B5247840473DE939234D83B61612B42B2398D79036101CD17ADA5AEA08B8A63F" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021-deobf.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.4.110021-deobf.jar", - "sha256": "DE4B48C6C939583CFA68BEB6D375AF841303897CDCB0F9B95E59BB97F660FF84" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021-deobf.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs-dev/ElectricAdvantage-2.2.5.110021-deobf.jar", + "sha256": "2E1ED596049D891C3A41ECC9DFE8979E39DED56651B8DE6DB2A9A4709F5A1AF9" } ] } diff --git a/test-rig/profiles/packaged-current.json b/test-rig/profiles/packaged-current.json index 73b2b30..ec883de 100644 --- a/test-rig/profiles/packaged-current.json +++ b/test-rig/profiles/packaged-current.json @@ -32,17 +32,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "basemetals", diff --git a/test-rig/profiles/packaged-decoupled.json b/test-rig/profiles/packaged-decoupled.json index a59efd3..a8686d0 100644 --- a/test-rig/profiles/packaged-decoupled.json +++ b/test-rig/profiles/packaged-decoupled.json @@ -32,17 +32,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "orespawn", diff --git a/test-rig/profiles/packaged-legacy.json b/test-rig/profiles/packaged-legacy.json index 60b1237..4515c11 100644 --- a/test-rig/profiles/packaged-legacy.json +++ b/test-rig/profiles/packaged-legacy.json @@ -32,17 +32,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "basemetals", diff --git a/test-rig/profiles/packaged-mineralogy.json b/test-rig/profiles/packaged-mineralogy.json index b82624d..c05074d 100644 --- a/test-rig/profiles/packaged-mineralogy.json +++ b/test-rig/profiles/packaged-mineralogy.json @@ -32,17 +32,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "orespawn", diff --git a/test-rig/profiles/packaged-optional-power.json b/test-rig/profiles/packaged-optional-power.json index 29ca2bb..3523a7e 100644 --- a/test-rig/profiles/packaged-optional-power.json +++ b/test-rig/profiles/packaged-optional-power.json @@ -32,17 +32,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "rf-api", diff --git a/test-rig/profiles/worldgen-advantage.json b/test-rig/profiles/worldgen-advantage.json index 0eaa12b..9b39614 100644 --- a/test-rig/profiles/worldgen-advantage.json +++ b/test-rig/profiles/worldgen-advantage.json @@ -30,17 +30,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "orespawn", diff --git a/test-rig/profiles/worldgen-legacy-import.json b/test-rig/profiles/worldgen-legacy-import.json index e0a68c9..6eb7cd6 100644 --- a/test-rig/profiles/worldgen-legacy-import.json +++ b/test-rig/profiles/worldgen-legacy-import.json @@ -30,17 +30,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "orespawn", diff --git a/test-rig/profiles/worldgen-mineralogy.json b/test-rig/profiles/worldgen-mineralogy.json index c409fda..d249b3f 100644 --- a/test-rig/profiles/worldgen-mineralogy.json +++ b/test-rig/profiles/worldgen-mineralogy.json @@ -30,17 +30,17 @@ }, { "id": "steamadvantage", - "version": "2.2.4.110021", - "file": "SteamAdvantage-2.2.4.110021.jar", - "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.4.110021.jar", - "sha256": "F9A1081C1D6D80BA1C9BE0DEE9975148B16D4622300A0198F59C92E354A3F54C" + "version": "2.2.5.110021", + "file": "SteamAdvantage-2.2.5.110021.jar", + "path": "../../SteamAdvantage/SteamAdvantage/build/libs/SteamAdvantage-2.2.5.110021.jar", + "sha256": "1C9DE2F9EE29439B727D2087E18BAD5277115BCCF7162F0F9342F322F44F9E9E" }, { "id": "electricadvantage", - "version": "2.2.4.110021", - "file": "ElectricAdvantage-2.2.4.110021.jar", - "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.4.110021.jar", - "sha256": "878613C35B91B123ACEDB8E3450E93E4CDB14CA5FEDE1964C2DAAA84568573E2" + "version": "2.2.5.110021", + "file": "ElectricAdvantage-2.2.5.110021.jar", + "path": "../../ElectricAdvantage/ElectricAdvantage/build/libs/ElectricAdvantage-2.2.5.110021.jar", + "sha256": "1854A854332FC02151C289BAEAF9DC3C6677ED6CDC1ED04EA8EDD0CB54A085F5" }, { "id": "orespawn",