Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read

concurrency:
group: steamadvantage-1.16-${{ github.workflow }}-${{ github.ref }}
group: basesteam-1.16-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -50,8 +50,8 @@ jobs:
- name: Check out PowerAdvantage 1.16.5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: MinecraftModDevelopmentMods/PowerAdvantage
ref: bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7
repository: MinecraftModDevelopmentMods/basePower
ref: ${{ env.POWERADVANTAGE_SOURCE_REF }}
path: .ci-dependencies/PowerAdvantage
- name: Install pinned Java 25 Mavenizer runtime
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
(cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar verifyReleaseDependencies \
-PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
--no-daemon --stacktrace)
powerjar="$power/build/libs-dev/PowerAdvantage-2.4.7.116051-deobf.jar"
powerjar="$power/build/libs-dev/basePower-2.4.8.116051-deobf.jar"
test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar"
echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT"
Expand All @@ -115,9 +115,9 @@ jobs:
if-no-files-found: error
retention-days: 30
path: |
build/libs/SteamAdvantage-2.2.8.116051.jar
build/libs/SteamAdvantage-2.2.8.116051-sources.jar
build/libs/SteamAdvantage-2.2.8.116051-javadoc.jar
build/libs/baseSteam-2.2.9.116051.jar
build/libs/baseSteam-2.2.9.116051-sources.jar
build/libs/baseSteam-2.2.9.116051-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.txt
- name: Upload diagnostics on failure
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
- name: Check out PowerAdvantage 1.16.5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: MinecraftModDevelopmentMods/PowerAdvantage
ref: bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7
repository: MinecraftModDevelopmentMods/basePower
ref: ${{ env.POWERADVANTAGE_SOURCE_REF }}
path: .ci-dependencies/PowerAdvantage
- name: Install pinned Java 25 Mavenizer runtime
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
(cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar verifyReleaseDependencies \
-PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
--no-daemon --stacktrace)
powerjar="$power/build/libs-dev/PowerAdvantage-2.4.7.116051-deobf.jar"
powerjar="$power/build/libs-dev/basePower-2.4.8.116051-deobf.jar"
test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar"
echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ permissions:
contents: read

concurrency:
group: steamadvantage-release-tag-${{ github.ref_name }}
group: basesteam-release-tag-${{ github.ref_name }}
cancel-in-progress: false

jobs:
validate-release-tag:
name: Validate tag for manual release confirmation
if: github.repository == 'MinecraftModDevelopmentMods/SteamAdvantage'
if: github.repository == 'MinecraftModDevelopmentMods/baseSteam'
runs-on: ubuntu-latest
timeout-minutes: 10

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
baseSteam 2.2.9.116051 (Minecraft 1.16.5)

- Bring baseSteam to Minecraft 1.16.5 and use the shared basePower creative tab.
- Map legacy Steam Advantage blocks, items and saved machine state to baseSteam when upgrading.
- Fix Eclipse refreshes when ForgeGradle reuses an existing client or server launch.

Steam Advantage 2.2.8.116051 (local port candidate)

- Read live redstone before the crusher and furnace resume after loading, preserving saved work and the first-tick steam heat bonus without changing the normal polling interval.
Expand Down
37 changes: 15 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
# SteamAdvantage
# baseSteam

**Minecraft 1.16.5 source port candidate, version 2.2.8.116051.**
This source port remains pending manual acceptance and publication approval.
The follow-up checks use finite supplies and ordinary server ticks to measure
actual machine output, energy use, blocked routes and saved state. They also
cover fluid pickup without destroying waterlogged blocks. Rendered GUI checks
require machine names and inventory labels as well as correctly placed controls.
The shared record below identifies the current jars and each completed run;
earlier results are retained separately rather than counted again.
Earlier-candidate results and accepted 1.15 results do not qualify this candidate.
**Minecraft 1.16.5, version 2.2.9.116051.**

The [shared test record](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.16.5/docs/1.16/CURRENT-QUALIFICATION.md)
records the exact jars, completed checks and remaining limits.
Use [basePower 2.4.8.116051](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9501921)
and [Base Metals 3.1.1.116051](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9501458). The
[shared test record](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.16.5/docs/1.16/BASE-RELEASE-CANDIDATE.md)
covers machine operation, world upgrades and full restarts.

Steam Advantage adds steam-powered machines and infrastructure to Power Advantage.
baseSteam continues DrCyano's Steam Advantage. It adds boilers, steam
distribution and steam-powered machinery to basePower. Back up your world
before upgrading; the port maps legacy Steam Advantage blocks and saved state.

## Build Target

Expand All @@ -23,11 +19,8 @@ ForgeGradle 7.0.34 and Gradle 9.6.1 run on Temurin 17.0.1+12.
Compilation and Minecraft launches use Temurin 8.0.502+7 and Java 8 bytecode;
Mavenizer uses Temurin 25.0.3+9.0.LTS.

Power Advantage 2.4.7.116051 remains a separate required mod. The pinned compile
dependency uses source `bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7`.
Its development jar SHA-256 is
`2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386`.
These exact pins are recorded in `gradle.properties` and audited during builds.
basePower 2.4.8.116051 is a separate required mod. Its source revision and
development JAR checksum are pinned in `gradle.properties` and checked during builds.
Use an immutable development jar through `-PpowerAdvantageDeobfJar=<path>`.
Release audits reject missing, placeholder, or mismatched pins. These source pins
do not grant publication approval.
Expand Down Expand Up @@ -68,9 +61,9 @@ against the same cache or checkout.

## Compatibility

Runtime identities remain `steamadvantage:*`; the implementation namespace remains
`zone.moddev.mc.steamadvantage`. Registry names, tile IDs, resources, recipes,
trade ranges, machine costs, output quantities, and persistent NBT remain stable.
New saves use `basesteam:*`. The shared upgrade code maps older
`steamadvantage:*` IDs to their baseSteam equivalents. Trade ranges, machine
costs, output quantities and saved machine data are preserved.

The native port uses world-only conduit callbacks. Power Advantage owns registry-key
dimension handling, shared capability invalidation/revival, fluid adapters, and base
Expand Down Expand Up @@ -99,7 +92,7 @@ pinned inputs. Preserve original worlds and backups; never open a world in an
older Minecraft version after upgrading it. Manual acceptance and publication
approval remain separate from automated evidence.

The shared [machine operating checks](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.16.5/docs/1.16/OPERATING-TESTS.md)
The shared [machine operating checks](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.16.5/docs/1.16/OPERATING-TESTS.md)
exercise finite boiler, processing, pumping, storage, elevator and musket jobs.
They check real output and resource use, including failed jobs and complete
server restarts. Live player controls and rendering still need a walkthrough.
Loading
Loading