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
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Disable autocrlf on generated files, they always generate with LF
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
# Keep source, scripts and generated text portable between Windows and Linux.
* text=auto eol=lf
*.png binary
*.jar binary
*.zip binary
*.nbt binary
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
src/main/resources/assets/basemetals/models/block/*_ore.json text eol=lf
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Base Metals 1.13.2 CI
name: Base Metals 1.14.4 CI

on:
push:
branches:
- master-1.13.2
- master-1.14.4
- 'feature/**'
pull_request:
branches:
- master-1.13.2
- master-1.14.4

permissions:
contents: read

concurrency:
group: basemetals-1.13-${{ github.workflow }}-${{ github.ref }}
group: basemetals-1.14-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -133,17 +133,17 @@ jobs:
clean verifyGeneratedOreModels check build javadoc verifyReleaseArtifacts writeReleaseChecksums
verifyEclipseProductionClasspath
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
--no-daemon --stacktrace --max-workers=2
--no-daemon --no-build-cache --stacktrace --max-workers=2
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
-Dorg.gradle.java.installations.auto-detect=false
-Dorg.gradle.java.installations.auto-download=false
)
./gradlew "${gradle_args[@]}"
first="$RUNNER_TEMP/basemetals-first"
mkdir -p "$first"
cp build/libs/BaseMetals-3.0.1.113021.jar "$first/"
cp build/libs/BaseMetals-3.0.1.113021-sources.jar "$first/"
cp build/libs/BaseMetals-3.0.1.113021-javadoc.jar "$first/"
cp build/libs/BaseMetals-3.0.1.114041.jar "$first/"
cp build/libs/BaseMetals-3.0.1.114041-sources.jar "$first/"
cp build/libs/BaseMetals-3.0.1.114041-javadoc.jar "$first/"
cp build/release/SHA256SUMS "$first/"

- name: Rebuild and prove byte-identical archives
Expand All @@ -153,15 +153,15 @@ jobs:
gradle_args=(
clean assemble verifyReleaseArtifacts writeReleaseChecksums
-PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}"
--no-daemon --stacktrace --max-workers=2
--no-daemon --no-build-cache --stacktrace --max-workers=2
-Dorg.gradle.java.installations.paths="$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64"
-Dorg.gradle.java.installations.auto-detect=false
-Dorg.gradle.java.installations.auto-download=false
)
./gradlew "${gradle_args[@]}"
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021.jar" build/libs/BaseMetals-3.0.1.113021.jar
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021-sources.jar" build/libs/BaseMetals-3.0.1.113021-sources.jar
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.113021-javadoc.jar" build/libs/BaseMetals-3.0.1.113021-javadoc.jar
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.114041.jar" build/libs/BaseMetals-3.0.1.114041.jar
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.114041-sources.jar" build/libs/BaseMetals-3.0.1.114041-sources.jar
cmp "$RUNNER_TEMP/basemetals-first/BaseMetals-3.0.1.114041-javadoc.jar" build/libs/BaseMetals-3.0.1.114041-javadoc.jar
cmp "$RUNNER_TEMP/basemetals-first/SHA256SUMS" build/release/SHA256SUMS

- name: Run exact-OreSpawn dedicated-server probe
Expand All @@ -181,21 +181,21 @@ jobs:
- name: Upload audited release candidate
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: BaseMetals-1.13.2-${{ github.sha }}
name: BaseMetals-1.14.4-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/BaseMetals-3.0.1.113021.jar
build/libs/BaseMetals-3.0.1.113021-sources.jar
build/libs/BaseMetals-3.0.1.113021-javadoc.jar
build/libs/BaseMetals-3.0.1.114041.jar
build/libs/BaseMetals-3.0.1.114041-sources.jar
build/libs/BaseMetals-3.0.1.114041-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.txt

- name: Upload bounded diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: BaseMetals-1.13.2-diagnostics-${{ github.sha }}
name: BaseMetals-1.14.4-diagnostics-${{ github.sha }}
if-no-files-found: ignore
retention-days: 14
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: CodeQL
on:
push:
branches:
- master-1.13.2
- master-1.14.4
- 'feature/**'
pull_request:
branches:
- master-1.13.2
- master-1.14.4
schedule:
- cron: '37 7 * * 4'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
on:
push:
branches:
- master-1.13.2
- master-1.14.4
- 'feature/**'
pull_request:
branches:
- master-1.13.2
- master-1.14.4

permissions:
contents: read
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
Base Metals 3.0.1.114041

- Bring the finished 1.13.2 port to Minecraft 1.14.4 and Forge 28.2.26.
- Keep existing blocks, items, recipes, save identities, High/Low Fantasy
settings and material-based recipe discovery.
- Fix a crossbow crash when firing without bolts in Creative mode. Crossbows
use an iron bolt for the free shot instead of Minecraft's arrow fallback.
- Use native 1.14 configuration widgets and Forge's Mods-list Config button.
OreSpawn's cog opens the same screen.
- Use Forge's fluid textures and colours without the old renderer patch.
- Move smith trades to Armorer, Toolsmith and Weaponsmith, with normal
restocking and profession experience. Add the old blacksmith loot to each
profession's village chest.
- Generate block loot tables for 1.14, including doors, slabs and worn anvils.
- Keep legacy-world migration and custom-anvil handling, while removing the
obsolete Forge 1.13 leaves patch.
- Let 1.13 saves load without Forge stopping on the retired vanilla villager
registry. Villagers and their existing trades remain for Minecraft to convert.
- Preserve the old vanilla sign and dye registry names when upgrading a world.
- Keep Kiri's ore overlays, vanilla host textures and automatic model updates.
- Build against the published OreSpawn 4.1.0.114041 release. The eleven ore
rules and their defaults are unchanged.
- Split the longer build checks into focused scripts and retain ForgeGradle 7,
reproducible archives, checked dependencies and isolated test launches.

Base Metals 3.0.1.113021

- Add the configuration screen to Forge's Mods list and OreSpawn's cog, with
Expand Down
22 changes: 11 additions & 11 deletions LICENSE-ART.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public L

By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.

Section 1 – Definitions.
Section 1 – Definitions.

Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
Expand All @@ -22,7 +22,7 @@ Section 1
Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.

Section 2 – Scope.
Section 2 – Scope.

License grant.
Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
Expand All @@ -32,8 +32,8 @@ Section 2
Term. The term of this Public License is specified in Section 6(a).
Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
Downstream recipients.
Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).

Expand All @@ -42,7 +42,7 @@ Section 2
Patent and trademark rights are not licensed under this Public License.
To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.

Section 3 – License Conditions.
Section 3 – License Conditions.

Your exercise of the Licensed Rights is expressly made subject to the following conditions.

Expand All @@ -62,11 +62,11 @@ Your exercise of the Licensed Rights is expressly made subject to the following
ShareAlike.

In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.

Section 4 – Sui Generis Database Rights.
Section 4 – Sui Generis Database Rights.

Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:

Expand All @@ -76,14 +76,14 @@ Where the Licensed Rights include Sui Generis Database Rights that apply to Your

For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.

Section 5 – Disclaimer of Warranties and Limitation of Liability.
Section 5 – Disclaimer of Warranties and Limitation of Liability.

Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.

The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.

Section 6 – Term and Termination.
Section 6 – Term and Termination.

This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.

Expand All @@ -94,12 +94,12 @@ Section 6
For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
Sections 1, 5, 6, 7, and 8 survive termination of this Public License.

Section 7 – Other Terms and Conditions.
Section 7 – Other Terms and Conditions.

The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.

Section 8 – Interpretation.
Section 8 – Interpretation.

For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
Expand Down
Loading
Loading