Skip to content

Commit 4e66daa

Browse files
SkyBlade1978SkyBlade1978
authored
Merge pull request #10 from SkyBlade1978/feature/baseelectric-1.14.4-identity-migration
Continue Electric Advantage as baseElectric on 1.14.4
2 parents 68784f6 + 261ab6d commit 4e66daa

683 files changed

Lines changed: 4091 additions & 4071 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
contents: read
1111

1212
concurrency:
13-
group: electricadvantage-1.14-${{ github.workflow }}-${{ github.ref }}
13+
group: baseelectric-1.14-${{ github.workflow }}-${{ github.ref }}
1414
cancel-in-progress: true
1515

1616
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 105
2121
steps:
22-
- name: Check out ElectricAdvantage
22+
- name: Check out baseElectric
2323
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
2424
- name: Check out pinned OreSpawn
2525
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
@@ -36,11 +36,21 @@ jobs:
3636
repository: MinecraftModDevelopmentMods/BaseMetals
3737
ref: 713802f93f2d1f650e1593fa35c487ea43add4a5
3838
path: .ci-dependencies/BaseMetals
39-
- name: Check out PowerAdvantage 1.14.4
39+
- name: Read basePower source pin
40+
id: power-pin
41+
shell: bash
42+
run: |
43+
ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties)
44+
if [[ ! "$ref" =~ ^[a-f0-9]{40}$ ]]; then
45+
echo "::error::Set poweradvantage_source_ref to the exact hosted basePower commit before building in CI."
46+
exit 1
47+
fi
48+
echo "ref=$ref" >> "$GITHUB_OUTPUT"
49+
- name: Check out pinned basePower
4050
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
4151
with:
42-
repository: MinecraftModDevelopmentMods/PowerAdvantage
43-
ref: 1d498ca02b6795b16435f0ece35ac04c67ef6948
52+
repository: MinecraftModDevelopmentMods/basePower
53+
ref: ${{ steps.power-pin.outputs.ref }}
4454
path: .ci-dependencies/PowerAdvantage
4555
- name: Install Java 8 toolchain
4656
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
@@ -70,38 +80,36 @@ jobs:
7080
(cd "$power" && ./gradlew jar verifyReleaseDependencies \
7181
-PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
7282
--no-daemon --stacktrace)
73-
powerjar="$power/build/libs-dev/PowerAdvantage-2.4.5.114041-deobf.jar"
83+
powerjar="$power/build/libs-dev/basePower-2.4.6.114041-deobf.jar"
7484
test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar"
7585
echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
7686
echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT"
7787
echo "power=$powerjar" >> "$GITHUB_OUTPUT"
78-
echo "power_ref=$(git -C "$power" rev-parse HEAD)" >> "$GITHUB_OUTPUT"
7988
- name: Build and audit release artifacts
8089
run: >-
8190
./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts
8291
writeReleaseChecksums verifyEclipseProductionClasspath
8392
-PpowerAdvantageDeobfJar=${{ steps.dependencies.outputs.power }}
84-
-Ppoweradvantage_source_ref=${{ steps.dependencies.outputs.power_ref }}
8593
-PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }}
8694
-PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }}
8795
--no-daemon --stacktrace
8896
- name: Upload audited release candidate
8997
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
9098
with:
91-
name: ElectricAdvantage-1.14.4-${{ github.sha }}
99+
name: baseElectric-1.14.4-${{ github.sha }}
92100
if-no-files-found: error
93101
retention-days: 30
94102
path: |
95-
build/libs/ElectricAdvantage-2.2.6.114041.jar
96-
build/libs/ElectricAdvantage-2.2.6.114041-sources.jar
97-
build/libs/ElectricAdvantage-2.2.6.114041-javadoc.jar
103+
build/libs/baseElectric-2.2.8.114041.jar
104+
build/libs/baseElectric-2.2.8.114041-sources.jar
105+
build/libs/baseElectric-2.2.8.114041-javadoc.jar
98106
build/release/SHA256SUMS
99107
CHANGELOG.txt
100108
- name: Upload diagnostics on failure
101109
if: failure()
102110
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
103111
with:
104-
name: ElectricAdvantage-1.14.4-diagnostics-${{ github.sha }}
112+
name: baseElectric-1.14.4-diagnostics-${{ github.sha }}
105113
if-no-files-found: ignore
106114
retention-days: 14
107115
path: |

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,21 @@ jobs:
3636
repository: MinecraftModDevelopmentMods/BaseMetals
3737
ref: 713802f93f2d1f650e1593fa35c487ea43add4a5
3838
path: .ci-dependencies/BaseMetals
39-
- name: Check out PowerAdvantage 1.14.4
39+
- name: Read basePower source pin
40+
id: power-pin
41+
shell: bash
42+
run: |
43+
ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties)
44+
if [[ ! "$ref" =~ ^[a-f0-9]{40}$ ]]; then
45+
echo "::error::Set poweradvantage_source_ref to the exact hosted basePower commit before building in CI."
46+
exit 1
47+
fi
48+
echo "ref=$ref" >> "$GITHUB_OUTPUT"
49+
- name: Check out pinned basePower
4050
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
4151
with:
42-
repository: MinecraftModDevelopmentMods/PowerAdvantage
43-
ref: 1d498ca02b6795b16435f0ece35ac04c67ef6948
52+
repository: MinecraftModDevelopmentMods/basePower
53+
ref: ${{ steps.power-pin.outputs.ref }}
4454
path: .ci-dependencies/PowerAdvantage
4555
- name: Install Java 8 toolchain
4656
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
@@ -70,12 +80,11 @@ jobs:
7080
(cd "$power" && ./gradlew jar verifyReleaseDependencies \
7181
-PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \
7282
--no-daemon --stacktrace)
73-
powerjar="$power/build/libs-dev/PowerAdvantage-2.4.5.114041-deobf.jar"
83+
powerjar="$power/build/libs-dev/basePower-2.4.6.114041-deobf.jar"
7484
test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar"
7585
echo "orespawn=$osjar" >> "$GITHUB_OUTPUT"
7686
echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT"
7787
echo "power=$powerjar" >> "$GITHUB_OUTPUT"
78-
echo "power_ref=$(git -C "$power" rev-parse HEAD)" >> "$GITHUB_OUTPUT"
7988
- name: Initialize CodeQL
8089
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
8190
with:
@@ -85,7 +94,6 @@ jobs:
8594
chmod +x ./gradlew
8695
./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace \
8796
-PpowerAdvantageDeobfJar=${{ steps.dependencies.outputs.power }} \
88-
-Ppoweradvantage_source_ref=${{ steps.dependencies.outputs.power_ref }} \
8997
-PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }} \
9098
-PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }}
9199
- name: Analyze

‎.github/workflows/release-on-tag.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ permissions:
1010
contents: read
1111

1212
concurrency:
13-
group: electricadvantage-release-tag-${{ github.ref_name }}
13+
group: baseelectric-release-tag-${{ github.ref_name }}
1414
cancel-in-progress: false
1515

1616
jobs:
1717
validate-release-tag:
1818
name: Validate tag for manual release confirmation
19-
if: github.repository == 'MinecraftModDevelopmentMods/ElectricAdvantage'
19+
if: github.repository == 'MinecraftModDevelopmentMods/baseElectric'
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 10
2222

‎CHANGELOG.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
Unreleased
1+
2.2.8.114041 - baseElectric for Minecraft 1.14.4
2+
3+
- Continue Electric Advantage under the baseElectric name on Forge 1.14.4.
4+
- Built and tested with the published basePower 2.4.6.114041 release.
5+
- Keep old electric machine IDs and the turbine link readable when upgrading.
6+
- Find the electric machines and parts on the shared basePower creative tab.
7+
8+
Earlier 1.14.4 fixes
29

310
- Check generator redstone before the first power pulse so a disabled solar panel cannot produce a startup burst.
411
- Stop the electric still consuming oil and power when its full output will not fit.

‎README.md‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
# ElectricAdvantage
1+
# baseElectric for Minecraft 1.14.4
22

3-
**Minecraft 1.14.4 port, version 2.2.6.114041.** Native compilation and all 34 unit
4-
tests pass, with no tests skipped. The combined-mod automated checks also cover
5-
client resources, connected machinery, drill movement, chunk lifecycle, restart
6-
persistence and disposable-copy migration. The
7-
[1.14 test results](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.14.4/docs/1.14/BROADER-QUALIFICATION.md)
8-
describe the tested scenarios and remaining limits, not a guarantee for an entire modpack.
3+
baseElectric continues DrCyano's Electric Advantage. It adds generators, batteries, wiring and electric machines to basePower. Find them on the **basePower** creative tab.
94

10-
Electric Advantage adds electric machines, generation, storage, automation, and defence to Power Advantage for Minecraft 1.14.4.
5+
Use [basePower 2.4.6.114041](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9477873) for Minecraft 1.14.4. Back up your world and config before upgrading, and test the upgrade on a copy first.
116

127
Every crafting and vanilla smelting variant has an ingredient-triggered recipe-book discovery. See the [shared material checklist and discovery tests](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.13.2/docs/1.13/RECIPE-DISCOVERY.md) and [manufacturing progression audit](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.13.2/docs/1.13/MANUFACTURING-PROGRESSION.md). Regenerate unlock JSON after recipe changes with `node tools/generate-recipe-unlocks.js`; `check` audits recipe coverage and criteria. Custom machine and crushing recipes are not crafting-book entries.
138

@@ -17,10 +12,9 @@ The `master-1.14.4` build targets Forge `28.2.26`, mappings `snapshot 20190719-1
1712
and MCP `20190829.143755`, using ForgeGradle `7.0.34` and Gradle `9.6.1`.
1813
Run Gradle with Java 17; production code is compiled for Java 8.
1914

20-
Build the matching 1.14 PowerAdvantage, Base Metals and OreSpawn deobf jars first.
21-
Dependency versions, checksums and the exact Power source reference belong in
22-
`gradle.properties`. Release audits reject missing or placeholder pins; do not
23-
bypass those checks or substitute a 1.13 dependency.
15+
Build the matching 1.14 basePower, Base Metals and OreSpawn deobf jars first.
16+
`gradle.properties` records the published basePower file and its SHA-256,
17+
along with the exact source commit and development jar hash used to build baseElectric.
2418
With the standard sibling layout:
2519

2620
```text

0 commit comments

Comments
 (0)