Skip to content

Commit 0b60748

Browse files
SkyBlade1978SkyBlade1978
authored
Merge pull request #33 from SkyBlade1978/feature/baseelectric-26.1.2-port
Bring baseElectric to Minecraft 26.1.2
2 parents 951fc39 + 798ad77 commit 0b60748

63 files changed

Lines changed: 1929 additions & 460 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.

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
*.ogg binary
55
*.jar binary
66
*.zip binary
7+
# Preserve the exact atlas bytes used by the frozen native client candidate.
8+
src/main/resources/assets/minecraft/atlases/blocks.json -text whitespace=blank-at-eol,blank-at-eof,space-before-tab,cr-at-eol
9+
src/main/resources/assets/minecraft/atlases/items.json -text whitespace=blank-at-eol,blank-at-eof,space-before-tab,cr-at-eol

‎.github/verify-published-pins.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ done
1818
require_merged() {
1919
local repo="$1" ref="$2" status
2020
[[ "$ref" =~ ^[a-f0-9]{40}$ ]]
21-
status="$(gh api "repos/MinecraftModDevelopmentMods/$repo/compare/$ref...master-1.21.11" --jq '.status')"
21+
status="$(gh api "repos/MinecraftModDevelopmentMods/$repo/compare/$ref...master-26.1.2" --jq '.status')"
2222
case "$status" in
2323
identical|ahead) ;;
24-
*) echo "::error::$repo $ref is not on upstream master-1.21.11 ($status)."; exit 1 ;;
24+
*) echo "::error::$repo $ref is not on upstream master-26.1.2 ($status)."; exit 1 ;;
2525
esac
2626
}
2727

@@ -48,7 +48,7 @@ require_merged basePower "$power_ref"
4848
require_merged BaseMetals "$(value basemetals_source_commit)"
4949
require_merged OreSpawn "$orespawn_ref"
5050

51-
inputs="${RUNNER_TEMP:?}/forge61-release-dependencies"
51+
inputs="${RUNNER_TEMP:?}/forge64-release-dependencies"
5252
mkdir -p "$inputs"
5353
power="$inputs/basePower-$(value poweradvantage_version).jar"
5454
metals="$inputs/BaseMetals-$(value basemetals_version).jar"
@@ -57,8 +57,8 @@ public_jar basePower 1780140 "$(value poweradvantage_public_file_id)" "$(value p
5757
public_jar BaseMetals 240967 "$(value basemetals_public_file_id)" "$(value basemetals_deobf_sha256)" "$metals"
5858
public_jar OreSpawn 245586 "$(value orespawn_public_file_id)" "$(value orespawn_deobf_sha256)" "$orespawn"
5959

60-
installer="$inputs/forge-1.21.11-61.1.0-installer.jar"
61-
download 'https://maven.minecraftforge.net/net/minecraftforge/forge/1.21.11-61.1.0/forge-1.21.11-61.1.0-installer.jar' \
60+
installer="$inputs/forge-26.1.2-64.1.5-installer.jar"
61+
download 'https://maven.minecraftforge.net/net/minecraftforge/forge/26.1.2-64.1.5/forge-26.1.2-64.1.5-installer.jar' \
6262
"$(value forge_installer_sha256)" "$installer"
6363
{
6464
printf 'power_ref=%s\n' "$power_ref"

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
name: baseElectric 1.21.11 CI
1+
name: baseElectric 26.1.2 CI
22

33
on:
44
push:
5-
branches: [master-1.21.11, 'feature/**']
5+
branches: [master-26.1.2, 'feature/**']
66
pull_request:
7-
branches: [master-1.21.11]
7+
branches: [master-26.1.2]
88

99
permissions:
1010
contents: read
1111

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

1616
jobs:
@@ -40,29 +40,19 @@ jobs:
4040
repository: MinecraftModDevelopmentMods/basePower
4141
ref: ${{ steps.public-pins.outputs.power_ref }}
4242
path: .ci-dependencies/basePower
43-
- name: Install Java 25 for Mavenizer
43+
- name: Install Java 25 for all build and runtime roles
4444
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
4545
with:
4646
distribution: temurin
4747
java-version: '25.0.3+9.0.LTS'
48-
- name: Install Java 8 for the launcher helper
49-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
50-
with:
51-
distribution: temurin
52-
java-version: '8.0.502+7'
53-
- name: Install Java 21 for Gradle and production
54-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
55-
with:
56-
distribution: temurin
57-
java-version: '21.0.7+6.0.LTS'
5848
- name: Use pinned build toolchains
5949
run: >-
60-
echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
50+
echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME
6151
-Porg.gradle.java.installations.auto-detect=false
6252
-Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
6353
- name: Set up Gradle
6454
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
65-
- name: Verify the Forge 61 build inputs
55+
- name: Verify the Forge 64 build inputs
6656
shell: bash
6757
env:
6858
ORESPAWN_REF: ${{ steps.public-pins.outputs.orespawn_ref }}
@@ -74,33 +64,34 @@ jobs:
7464
test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_REF"
7565
test "$(git -C "$power" rev-parse HEAD)" = "$POWER_REF"
7666
mavenizer="$orespawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar"
77-
printf '%s %s\n' 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' "$mavenizer" | sha256sum -c -
67+
printf '%s %s\n' 'BB0DACB3DEB2A711CA67DD402D5FDAB5A9847C37C7B9B596DEC7CF37378FA085' "$mavenizer" | sha256sum -c -
7868
echo "MAVENIZER=$mavenizer" >> "$GITHUB_ENV"
7969
- name: Build and audit release artifacts
8070
shell: bash
8171
run: |
8272
./gradlew $MMD_GRADLE_TOOLCHAINS clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts \
8373
writeReleaseChecksums verifyEclipseProductionClasspath --no-build-cache --no-daemon --stacktrace \
84-
"-Pforge61MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
74+
"-Pforge64MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
75+
"-PpowerUnitSource=$GITHUB_WORKSPACE/.ci-dependencies/basePower" \
8576
"-PbaseMetalsDeobfJar=$METALS_PLAYER" "-PoreSpawnDeobfJar=$ORESPAWN_PLAYER" \
8677
"-PforgeInstallerJar=$FORGE_INSTALLER"
8778
- name: Upload audited release candidate
8879
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
8980
with:
90-
name: baseElectric-1.21.11-${{ github.sha }}
81+
name: baseElectric-26.1.2-${{ github.sha }}
9182
if-no-files-found: error
9283
retention-days: 30
9384
path: |
94-
build/libs/baseElectric-2.2.16.121111.jar
95-
build/libs/baseElectric-2.2.16.121111-sources.jar
96-
build/libs/baseElectric-2.2.16.121111-javadoc.jar
85+
build/libs/baseElectric-2.2.17.2601021.jar
86+
build/libs/baseElectric-2.2.17.2601021-sources.jar
87+
build/libs/baseElectric-2.2.17.2601021-javadoc.jar
9788
build/release/SHA256SUMS
9889
CHANGELOG.txt
9990
- name: Upload diagnostics on failure
10091
if: failure()
10192
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
10293
with:
103-
name: baseElectric-1.21.11-diagnostics-${{ github.sha }}
94+
name: baseElectric-26.1.2-diagnostics-${{ github.sha }}
10495
if-no-files-found: ignore
10596
retention-days: 14
10697
path: |

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: CodeQL
22

33
on:
44
push:
5-
branches: [master-1.21.11, 'feature/**']
5+
branches: [master-26.1.2, 'feature/**']
66
pull_request:
7-
branches: [master-1.21.11]
7+
branches: [master-26.1.2]
88

99
permissions:
1010
contents: read
1111
actions: read
1212
security-events: write
1313

1414
concurrency:
15-
group: baseelectric-1.21.11-${{ github.workflow }}-${{ github.ref }}
15+
group: baseelectric-26.1.2-${{ github.workflow }}-${{ github.ref }}
1616
cancel-in-progress: true
1717

1818
jobs:
@@ -42,29 +42,19 @@ jobs:
4242
repository: MinecraftModDevelopmentMods/basePower
4343
ref: ${{ steps.public-pins.outputs.power_ref }}
4444
path: .ci-dependencies/basePower
45-
- name: Install Java 25 for Mavenizer
45+
- name: Install Java 25 for all build and runtime roles
4646
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
4747
with:
4848
distribution: temurin
4949
java-version: '25.0.3+9.0.LTS'
50-
- name: Install Java 8 for the launcher helper
51-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
52-
with:
53-
distribution: temurin
54-
java-version: '8.0.502+7'
55-
- name: Install Java 21 for Gradle and production
56-
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
57-
with:
58-
distribution: temurin
59-
java-version: '21.0.7+6.0.LTS'
6050
- name: Use pinned build toolchains
6151
run: >-
62-
echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64
52+
echo "MMD_GRADLE_TOOLCHAINS=-Porg.gradle.java.installations.paths=$JAVA_HOME
6353
-Porg.gradle.java.installations.auto-detect=false
6454
-Porg.gradle.java.installations.auto-download=false" >> "$GITHUB_ENV"
6555
- name: Set up Gradle
6656
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
67-
- name: Verify the Forge 61 build inputs
57+
- name: Verify the Forge 64 build inputs
6858
shell: bash
6959
env:
7060
ORESPAWN_REF: ${{ steps.public-pins.outputs.orespawn_ref }}
@@ -76,7 +66,7 @@ jobs:
7666
test "$(git -C "$orespawn" rev-parse HEAD)" = "$ORESPAWN_REF"
7767
test "$(git -C "$power" rev-parse HEAD)" = "$POWER_REF"
7868
mavenizer="$orespawn/ci-fixtures/tools/minecraft-mavenizer-0.5.21-orespawn-compat.jar"
79-
printf '%s %s\n' 'B36CA046DB72E30F27BD38E02B4AE34274ADB51AE1D65BAF9E1D07763755682E' "$mavenizer" | sha256sum -c -
69+
printf '%s %s\n' 'BB0DACB3DEB2A711CA67DD402D5FDAB5A9847C37C7B9B596DEC7CF37378FA085' "$mavenizer" | sha256sum -c -
8070
echo "MAVENIZER=$mavenizer" >> "$GITHUB_ENV"
8171
- name: Initialize CodeQL
8272
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4
@@ -87,7 +77,8 @@ jobs:
8777
shell: bash
8878
run: |
8979
./gradlew $MMD_GRADLE_TOOLCHAINS classes verifyReleaseDependencies --rerun-tasks --no-build-cache --no-daemon --stacktrace \
90-
"-Pforge61MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
80+
"-Pforge64MavenizerJar=$MAVENIZER" "-PpowerAdvantageDeobfJar=$POWER_PLAYER" \
81+
"-PpowerUnitSource=$GITHUB_WORKSPACE/.ci-dependencies/basePower" \
9182
"-PbaseMetalsDeobfJar=$METALS_PLAYER" "-PoreSpawnDeobfJar=$ORESPAWN_PLAYER"
9283
- name: Analyze
9384
uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4

‎.github/workflows/validate-gradle-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
33
on:
44
push:
55
branches:
6-
- master-1.21.11
6+
- master-26.1.2
77
- 'feature/**'
88
pull_request:
99
branches:
10-
- master-1.21.11
10+
- master-26.1.2
1111

1212
permissions:
1313
contents: read

‎CHANGELOG.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
baseElectric 2.2.17.2601021 (Minecraft 26.1.2 / Forge)
2+
3+
- Bring baseElectric to Minecraft 26.1.2 with Forge 64.1.5 and Java 25.
4+
- Preserve machine state, battery charge, old-world aliases, material ratios and recipe progression.
5+
- Keep all six librarian offers and their original ranges and tiers in native trade data.
6+
- Fix laser-beam texture loading and inherited battery models.
7+
- Preserve saved OreSpawn choices before generation and stop on ambiguous migrations.
8+
- Pin released basePower 2.4.16.2601021, Base Metals 3.1.2.2601021 and OreSpawn 4.1.1.2601021.
9+
- Complete the local machine, upgrade, graphical, endurance and manual-acceptance checks.
10+
111
baseElectric 2.2.16.121111 (Minecraft 1.21.11 / Forge)
212

313
- Port to Forge 61.1.0 with basePower 2.4.15.121111 and Java 21.

0 commit comments

Comments
 (0)