Skip to content

Commit c13495e

Browse files
authored
Merge pull request #23 from SkyBlade1978/feature/basegems112-port
Bring Base Gems up to date for Minecraft 1.12.2
2 parents 94f7dbb + 5c3f52b commit c13495e

724 files changed

Lines changed: 30140 additions & 3849 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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* text=auto eol=lf
2+
*.png binary
3+
*.jar binary
4+
*.zip binary

‎.github/workflows/ci.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Base Gems 1.12 CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master-1.12
7+
- 'feature/**'
8+
pull_request:
9+
branches:
10+
- master-1.12
11+
12+
permissions:
13+
contents: read
14+
15+
concurrency:
16+
group: basegems-1.12-${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
build:
21+
name: Build and verify
22+
runs-on: ubuntu-latest
23+
timeout-minutes: 30
24+
steps:
25+
- name: Check out source
26+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
27+
28+
- name: Validate the Gradle wrapper
29+
uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6
30+
31+
- name: Install Java 25 for Mavenizer
32+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
33+
with:
34+
distribution: temurin
35+
java-version: '25.0.3+9.0.LTS'
36+
37+
- name: Install Java 8 for Forge
38+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
39+
with:
40+
distribution: temurin
41+
java-version: '8.0.502+7'
42+
43+
- name: Install Java 17 for Gradle
44+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
45+
with:
46+
distribution: temurin
47+
java-version: '17.0.1+12'
48+
49+
- name: Stage checksum-verified dependencies
50+
run: python3 gradle/stage-legacy-dependencies.py .gradle/legacy-dependencies
51+
52+
- name: Build, audit jars and generate Eclipse launches
53+
shell: bash
54+
run: |
55+
set -euo pipefail
56+
./gradlew check build verifyReleaseArtifacts writeReleaseChecksums prepareEclipse \
57+
-PreleaseBuild=true --no-daemon --stacktrace --max-workers=2 \
58+
"-Dorg.gradle.java.installations.paths=$JAVA_HOME,$JAVA_HOME_8_X64,$JAVA_HOME_25_X64" \
59+
-Dorg.gradle.java.installations.auto-detect=false \
60+
-Dorg.gradle.java.installations.auto-download=false
61+
sha256sum build/libs/*.jar

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
bin
33
*.launch
44
.settings
5-
.settings/*
65
.metadata
76
.classpath
87
.project
@@ -21,9 +20,8 @@ build
2120
# other
2221
eclipse
2322
run
24-
classes
2523

2624
/README.txt
2725
/forge-*-changelog.txt
2826

29-
secret.json
27+
secret.json

‎.travis.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎CHANGELOG.txt‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
2.5.0.112021 for Minecraft 1.12.2
2+
3+
All 33 gems come across from 1.11.2, along with the OreSpawn deposits, mining
4+
XP, smith trades and both Fantasy Level settings. Use Java 8, Forge
5+
14.23.5.2859 or later for 1.12.2, MMDLib 1.0.0 RC3 and MMD OreSpawn
6+
4.1.6.112021. Base Metals is optional on this version.
7+
8+
- Pick up gems and their crafting materials to learn the recipes in the
9+
recipe book. It only teaches recipes allowed by your gem and Fantasy Level
10+
settings.
11+
- Gem bars, plates, doors and shields have their own models. Ore overlays
12+
still use the stone texture from your resource pack.
13+
- Keeps the Base Gems block and item IDs, config keys and Ore Dictionary
14+
names from 1.11.2.
15+
- Kept tools, weapons and shields in High Fantasy and left player and horse
16+
armour to add-ons. Low Fantasy keeps gem processing, storage blocks and
17+
smith trades.
18+
19+
2.5.0.111021 for Minecraft 1.11.2
20+
21+
This port brings over the 33 gems, OreSpawn deposits, mining XP, smith trades
22+
and both Fantasy Level settings from 1.10.2. Use Java 8, Forge 13.20.1.2588
23+
or later for 1.11.2, Base Metals 2.5.1.111021 and MMD OreSpawn 4.1.6.111021.
24+
25+
- Updated smith trades and the Forge Mods config screen for Forge 1.11.2.
26+
You can still open the same config from OreSpawn.
27+
- Updated the resource pack format so 1.11.2 loads all 18 language files.
28+
Gem ores still use overlays with the stone texture from your resource pack.
29+
- Kept the block and item IDs, config keys and Ore Dictionary names from 1.10.2.
30+
- Carried over ForgeGradle 7 and added a build check for the 1.11.2 branch.
31+
32+
2.5.0.110021 for Minecraft 1.10.2
33+
34+
Base Gems brings 33 gemstones to Minecraft 1.10.2. Use Java 8, Forge
35+
12.18.3.2511 or later for 1.10.2, Base Metals 2.6.0.110021 and MMD OreSpawn
36+
4.1.6.110021.
37+
38+
- Brought over the gem artwork and colours from 1.12.2. Ores use overlays
39+
so the stone from your resource pack shows through.
40+
- Added Overworld deposits through OreSpawn. Common gems turn up in
41+
shallower caves, while ruby, sapphire and black diamond reward deeper
42+
mining. Existing chunks stay as they are.
43+
- Gem ores give mining XP and support Fortune and Silk Touch. Smiths buy
44+
and sell gems as they level up.
45+
- Added High and Low Fantasy and individual gem switches to the Forge and
46+
OreSpawn Mods menus. Restart after changing them. Low Fantasy keeps
47+
mining, trading and processing while removing recipes for gem equipment,
48+
gears and structural parts.
49+
- Added Ore Dictionary names for gems and their material forms, including
50+
compound names such as gemBlackDiamond and gemBlueTopaz.
51+
- Kept gem tools, weapons and shields in High Fantasy. Player and horse
52+
armour are left to add-ons.
53+
- Translated gem names, blocks, equipment, fluids and config options across
54+
the same locale files as Base Metals.
55+
- Updated the build and Eclipse setup to ForgeGradle 7. Minecraft still runs
56+
on Java 8.

‎LICENSE-ART.txt‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
1-
Primary Art Contribution By Eejit
2-
Art for Molten Metals is from Tinkers Construct (See LICENSE-TiC.txt)
3-
Art for Base Gems (blocks, ores, ingots, powders, nuggets, weapons, tools, armors, doors, and trapdoors) by Aedda
1+
Base Gems artwork credits
2+
3+
Eejit — primary art contributor to the original template.
4+
Aedda — original Base Gems textures and colours, including storage blocks,
5+
ores, gems, powders, nuggets, weapons, tools, armour, doors and trapdoors.
6+
https://github.com/MinecraftModDevelopmentMods/BaseGems/commit/632e51853d869d4f6564087e0b4c82c8207d43dd
7+
8+
jmlovelace — redesigned the 33 gem icons (the historical ingot items).
9+
https://github.com/MinecraftModDevelopmentMods/BaseGems/pull/17
10+
11+
KiriCattus — adapted the ore art into overlays.
12+
https://github.com/MinecraftModDevelopmentMods/BaseGems/commit/dc9b80db279accd2d87defce4eff181e0be0bdca
13+
14+
Tinkers' Construct — original molten-metal textures (see LICENSE-TiC.txt).
15+
16+
Base Metals model templates — Chris Hall (CCHall) for bars, plates and
17+
doors, and SeqSEE for shields. The templates from Base Metals 2.5.1.111021
18+
are included under the Base Gems namespace.
19+
https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9526386
420

521
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
622

723
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.
824

9-
Section 1 � Definitions.
25+
Section 1 – Definitions.
1026

1127
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.
1228
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.
@@ -23,7 +39,7 @@ Section 1
2339
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.
2440
You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
2541

26-
Section 2 � Scope.
42+
Section 2 – Scope.
2743

2844
License grant.
2945
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:
@@ -33,8 +49,8 @@ Section 2
3349
Term. The term of this Public License is specified in Section 6(a).
3450
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.
3551
Downstream recipients.
36-
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.
37-
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.
52+
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.
53+
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.
3854
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.
3955
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).
4056

@@ -43,7 +59,7 @@ Section 2
4359
Patent and trademark rights are not licensed under this Public License.
4460
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.
4561

46-
Section 3 � License Conditions.
62+
Section 3 – License Conditions.
4763

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

@@ -63,11 +79,11 @@ Your exercise of the Licensed Rights is expressly made subject to the following
6379
ShareAlike.
6480

6581
In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
66-
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.
82+
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.
6783
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.
6884
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.
6985

70-
Section 4 � Sui Generis Database Rights.
86+
Section 4 – Sui Generis Database Rights.
7187

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

@@ -77,14 +93,14 @@ Where the Licensed Rights include Sui Generis Database Rights that apply to Your
7793

7894
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.
7995

80-
Section 5 � Disclaimer of Warranties and Limitation of Liability.
96+
Section 5 – Disclaimer of Warranties and Limitation of Liability.
8197

8298
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.
8399
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.
84100

85101
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.
86102

87-
Section 6 � Term and Termination.
103+
Section 6 – Term and Termination.
88104

89105
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.
90106

@@ -95,12 +111,12 @@ Section 6
95111
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.
96112
Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
97113

98-
Section 7 � Other Terms and Conditions.
114+
Section 7 – Other Terms and Conditions.
99115

100116
The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
101117
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.
102118

103-
Section 8 � Interpretation.
119+
Section 8 – Interpretation.
104120

105121
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.
106122
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.

0 commit comments

Comments
 (0)