Skip to content

Commit dacfaa3

Browse files
SkyBlade1978SkyBlade1978
authored
Merge Base Metals for Minecraft 1.17.1
Bring Base Metals to Minecraft 1.17.1
2 parents 6cbca75 + d64d168 commit dacfaa3

309 files changed

Lines changed: 6799 additions & 3244 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: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
name: Base Metals 1.16.5 CI
1+
name: Base Metals 1.17.1 CI
22

33
on:
44
push:
55
branches:
6-
- master-1.16.5
6+
- master-1.17.1
77
- 'feature/**'
88
pull_request:
99
branches:
10-
- master-1.16.5
10+
- master-1.17.1
1111

1212
permissions:
1313
contents: read
1414

1515
concurrency:
16-
group: basemetals-1.16-${{ github.workflow }}-${{ github.ref }}
16+
group: basemetals-1.17-${{ github.workflow }}-${{ github.ref }}
1717
cancel-in-progress: true
1818

1919
jobs:
@@ -32,12 +32,18 @@ jobs:
3232
distribution: temurin
3333
java-version: '25.0.3+9.0.LTS'
3434

35-
- name: Install pinned Java 8 compilation toolchain
35+
- name: Install Java 8 for the ForgeGradle renamer
3636
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
3737
with:
3838
distribution: temurin
3939
java-version: '8.0.502+7'
4040

41+
- name: Install pinned Java 16 compilation toolchain
42+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
43+
with:
44+
distribution: temurin
45+
java-version: '16.0.2+7'
46+
4147
- name: Install pinned Java 17 Gradle runtime
4248
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
4349
with:
@@ -65,7 +71,7 @@ jobs:
6571
classes test verifyReleaseDependencies
6672
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
6773
--no-daemon --no-build-cache --stacktrace --max-workers=2
68-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
74+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
6975
-Dorg.gradle.java.installations.auto-detect=false
7076
-Dorg.gradle.java.installations.auto-download=false
7177
)
@@ -81,7 +87,7 @@ jobs:
8187
classes test verifyReleaseDependencies
8288
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
8389
--rerun-tasks --offline --no-daemon --no-build-cache --stacktrace --max-workers=2
84-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
90+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
8591
-Dorg.gradle.java.installations.auto-detect=false
8692
-Dorg.gradle.java.installations.auto-download=false
8793
)
@@ -102,12 +108,18 @@ jobs:
102108
distribution: temurin
103109
java-version: '25.0.3+9.0.LTS'
104110

105-
- name: Install pinned Java 8 compilation toolchain
111+
- name: Install Java 8 for the ForgeGradle renamer
106112
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
107113
with:
108114
distribution: temurin
109115
java-version: '8.0.502+7'
110116

117+
- name: Install pinned Java 16 compilation toolchain
118+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
119+
with:
120+
distribution: temurin
121+
java-version: '16.0.2+7'
122+
111123
- name: Install pinned Java 17 Gradle runtime
112124
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
113125
with:
@@ -134,16 +146,16 @@ jobs:
134146
verifyEclipseProductionClasspath
135147
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
136148
--no-daemon --no-build-cache --stacktrace --max-workers=2
137-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
149+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
138150
-Dorg.gradle.java.installations.auto-detect=false
139151
-Dorg.gradle.java.installations.auto-download=false
140152
)
141153
./gradlew "${gradle_args[@]}"
142154
first="$RUNNER_TEMP/basemetals-first"
143155
mkdir -p "$first"
144-
cp build/libs/BaseMetals-3.1.0.116051.jar "$first/"
145-
cp build/libs/BaseMetals-3.1.0.116051-sources.jar "$first/"
146-
cp build/libs/BaseMetals-3.1.0.116051-javadoc.jar "$first/"
156+
cp build/libs/BaseMetals-3.1.0.117011.jar "$first/"
157+
cp build/libs/BaseMetals-3.1.0.117011-sources.jar "$first/"
158+
cp build/libs/BaseMetals-3.1.0.117011-javadoc.jar "$first/"
147159
cp build/release/SHA256SUMS "$first/"
148160
149161
- name: Rebuild and prove byte-identical archives
@@ -154,14 +166,14 @@ jobs:
154166
clean assemble verifyReleaseArtifacts writeReleaseChecksums
155167
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
156168
--no-daemon --no-build-cache --stacktrace --max-workers=2
157-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
169+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
158170
-Dorg.gradle.java.installations.auto-detect=false
159171
-Dorg.gradle.java.installations.auto-download=false
160172
)
161173
./gradlew "${gradle_args[@]}"
162-
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.116051.jar" build/libs/BaseMetals-3.1.0.116051.jar
163-
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.116051-sources.jar" build/libs/BaseMetals-3.1.0.116051-sources.jar
164-
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.116051-javadoc.jar" build/libs/BaseMetals-3.1.0.116051-javadoc.jar
174+
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.117011.jar" build/libs/BaseMetals-3.1.0.117011.jar
175+
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.117011-sources.jar" build/libs/BaseMetals-3.1.0.117011-sources.jar
176+
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.1.0.117011-javadoc.jar" build/libs/BaseMetals-3.1.0.117011-javadoc.jar
165177
cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS
166178
167179
- name: Run exact-OreSpawn dedicated-server probe
@@ -172,7 +184,7 @@ jobs:
172184
runRuntimeProbeServer
173185
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
174186
--no-daemon --stacktrace --max-workers=2
175-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
187+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
176188
-Dorg.gradle.java.installations.auto-detect=false
177189
-Dorg.gradle.java.installations.auto-download=false
178190
)
@@ -181,21 +193,21 @@ jobs:
181193
- name: Upload audited release candidate
182194
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
183195
with:
184-
name: BaseMetals-1.16.5-${{ github.sha }}
196+
name: BaseMetals-1.17.1-${{ github.sha }}
185197
if-no-files-found: error
186198
retention-days: 30
187199
path: |
188-
build/libs/BaseMetals-3.1.0.116051.jar
189-
build/libs/BaseMetals-3.1.0.116051-sources.jar
190-
build/libs/BaseMetals-3.1.0.116051-javadoc.jar
200+
build/libs/BaseMetals-3.1.0.117011.jar
201+
build/libs/BaseMetals-3.1.0.117011-sources.jar
202+
build/libs/BaseMetals-3.1.0.117011-javadoc.jar
191203
build/release/SHA256SUMS
192204
CHANGELOG.txt
193205
194206
- name: Upload bounded diagnostics on failure
195207
if: failure()
196208
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
197209
with:
198-
name: BaseMetals-1.16.5-diagnostics-${{ github.sha }}
210+
name: BaseMetals-1.17.1-diagnostics-${{ github.sha }}
199211
if-no-files-found: ignore
200212
retention-days: 14
201213
path: |

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: CodeQL
33
on:
44
push:
55
branches:
6-
- master-1.16.5
6+
- master-1.17.1
77
- 'feature/**'
88
pull_request:
99
branches:
10-
- master-1.16.5
10+
- master-1.17.1
1111
schedule:
1212
- cron: '37 7 * * 4'
1313

@@ -32,12 +32,18 @@ jobs:
3232
distribution: temurin
3333
java-version: '25.0.3+9.0.LTS'
3434

35-
- name: Install pinned Java 8 compilation toolchain
35+
- name: Install Java 8 for the ForgeGradle renamer
3636
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
3737
with:
3838
distribution: temurin
3939
java-version: '8.0.502+7'
4040

41+
- name: Install pinned Java 16 compilation toolchain
42+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
43+
with:
44+
distribution: temurin
45+
java-version: '16.0.2+7'
46+
4147
- name: Install pinned Java 17 Gradle runtime
4248
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
4349
with:
@@ -60,7 +66,7 @@ jobs:
6066
gradle_args=(
6167
clean classes
6268
--no-daemon --stacktrace --max-workers=2
63-
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
69+
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_16_X64,$JAVA_HOME_25_X64"
6470
-Dorg.gradle.java.installations.auto-detect=false
6571
-Dorg.gradle.java.installations.auto-download=false
6672
)

‎.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.16.5
6+
- master-1.17.1
77
- 'feature/**'
88
pull_request:
99
branches:
10-
- master-1.16.5
10+
- master-1.17.1
1111

1212
permissions:
1313
contents: read

‎CHANGELOG.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
Base Metals 3.1.0.117011
2+
3+
- Bring Base Metals to Minecraft 1.17.1 and Forge 37.1.1, with Java 16 for the game.
4+
- Add twelve raw metals. Ordinary ore mining drops raw material, Fortune gives
5+
extra drops, and Silk Touch keeps the ore block. Copper uses vanilla raw copper.
6+
- Keep direct hammer mining at two powders per ore. Each raw piece gives one
7+
powder through ground hammering or crushing, and smelts or blasts to one ingot.
8+
Raw metals cannot be used in powder blends.
9+
- Support vanilla raw iron, gold and copper, and crushing vanilla deepslate ores.
10+
- Leave Base Metals copper generation off in new OreSpawn profiles, without
11+
changing saved profiles or explicit overrides. Keep the other ore rules as before.
12+
- Use Forge's native model providers for Kiri's ore overlays, keeping the tested
13+
gap between the overlay and its vanilla background. The generateResources task
14+
updates saved output; ordinary builds check it without rewriting source files.
15+
- Keep High/Low Fantasy, configuration screens, equipment effects, molten buckets,
16+
material arrows and bolts, trades and recipes from the 1.16 release.
17+
- Keep the floor and walls visible through holes in trapdoors, doors and bars.
18+
Their collision shapes and placement behaviour are unchanged.
19+
- Update old-world migration, custom anvils, IDE launches and release checks for
20+
Forge 37. Test and datagen classes remain outside the published mod.
21+
- Remove invalid bed entities that vanilla's old-world converter can create on
22+
modded blocks. Real beds and their saved contents are left alone.
23+
- Protect saved Nether, End and custom-dimension chunks as well as the Overworld
24+
when neighbouring terrain is generated during an upgrade.
25+
- Pin the published OreSpawn 4.1.0.117011 release from Curse Maven.
26+
127
Base Metals 3.1.0.116051
228

329
- Bring the 1.15.2 release to Minecraft 1.16.5 and Forge 36.2.34.

0 commit comments

Comments
 (0)