Skip to content

Commit 1b4999b

Browse files
authored
Bring Base Gems up to date for Minecraft 1.10.2 (#19)
Bring Base Gems up to date for Minecraft 1.10.2
2 parents aecf36a + b6c635c commit 1b4999b

1,761 files changed

Lines changed: 27310 additions & 3409 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.10 CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master-1.10.2
7+
- 'feature/**'
8+
pull_request:
9+
branches:
10+
- master-1.10.2
11+
12+
permissions:
13+
contents: read
14+
15+
concurrency:
16+
group: basegems-1.10-${{ 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

‎.travis.yml‎

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

‎CHANGELOG.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2.5.0.110021 for Minecraft 1.10.2
2+
3+
Base Gems brings 33 gemstones to Minecraft 1.10.2. Use Java 8, Forge
4+
12.18.3.2511 or later for 1.10.2, Base Metals 2.6.0.110021 and MMD OreSpawn
5+
4.1.6.110021.
6+
7+
- Brought over the gem artwork and colours from 1.12.2. Ores use overlays
8+
so the stone from your resource pack shows through.
9+
- Added Overworld deposits through OreSpawn. Common gems turn up in
10+
shallower caves, while ruby, sapphire and black diamond reward deeper
11+
mining. Existing chunks stay as they are.
12+
- Gem ores give mining XP and support Fortune and Silk Touch. Smiths buy
13+
and sell gems as they level up.
14+
- Added High and Low Fantasy and individual gem switches to the Forge and
15+
OreSpawn Mods menus. Restart after changing them. Low Fantasy keeps
16+
mining, trading and processing while removing recipes for gem equipment,
17+
gears and structural parts.
18+
- Added Ore Dictionary names for gems and their material forms, including
19+
compound names such as gemBlackDiamond and gemBlueTopaz.
20+
- Kept gem tools, weapons and shields in High Fantasy. Player and horse
21+
armour are left to add-ons.
22+
- Translated gem names, blocks, equipment, fluids and config options across
23+
the same locale files as Base Metals.
24+
- Updated the build and Eclipse setup to ForgeGradle 7. Minecraft still runs
25+
on Java 8.

‎LICENSE-ART.txt‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1-
Primary Art Contribution By Eejit
2-
Art for Molten Metals is from Tinkers Construct (See LICENSE-TiC.txt)
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).
315

416
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
517

618
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.
719

8-
Section 1 � Definitions.
20+
Section 1 – Definitions.
921

1022
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.
1123
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.
@@ -22,7 +34,7 @@ Section 1
2234
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.
2335
You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
2436

25-
Section 2 � Scope.
37+
Section 2 – Scope.
2638

2739
License grant.
2840
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:
@@ -32,8 +44,8 @@ Section 2
3244
Term. The term of this Public License is specified in Section 6(a).
3345
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.
3446
Downstream recipients.
35-
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.
36-
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.
47+
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.
48+
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.
3749
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.
3850
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).
3951

@@ -42,7 +54,7 @@ Section 2
4254
Patent and trademark rights are not licensed under this Public License.
4355
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.
4456

45-
Section 3 � License Conditions.
57+
Section 3 – License Conditions.
4658

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

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

6476
In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
65-
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.
77+
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.
6678
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.
6779
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.
6880

69-
Section 4 � Sui Generis Database Rights.
81+
Section 4 – Sui Generis Database Rights.
7082

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

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

7789
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.
7890

79-
Section 5 � Disclaimer of Warranties and Limitation of Liability.
91+
Section 5 – Disclaimer of Warranties and Limitation of Liability.
8092

8193
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.
8294
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.
8395

8496
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.
8597

86-
Section 6 � Term and Termination.
98+
Section 6 – Term and Termination.
8799

88100
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.
89101

@@ -94,12 +106,12 @@ Section 6
94106
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.
95107
Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
96108

97-
Section 7 � Other Terms and Conditions.
109+
Section 7 – Other Terms and Conditions.
98110

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

102-
Section 8 � Interpretation.
114+
Section 8 – Interpretation.
103115

104116
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.
105117
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.

‎README.md‎

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,62 @@
1-
# BaseGems [![Build Status](https://travis-ci.org/jriwanek/BaseGems.svg?branch=master)](https://travis-ci.org/jriwanek/BaseGems)
2-
Addon to BaseMetals supporting Gemstones
1+
# Base Gems for Minecraft 1.10.2
32

4-
Content
5-
-------
6-
Bars
3+
Base Gems adds 33 gemstones to Base Metals. Mine agate and amethyst in upper
4+
caves, look deeper for ruby and sapphire, or head down near bedrock for black
5+
diamond. Trade gems with smiths or use them for storage blocks,
6+
decorative pieces, tools and equipment.
77

8-
Doors
8+
## Installation
99

10-
Ores
10+
Use Java 8 and Forge **12.18.3.2511 or later for Minecraft 1.10.2**. Put the
11+
game jars in the `mods` folder on both the client and server:
1112

12-
Plates
13+
- Base Gems `2.5.0.110021`.
14+
- [Base Metals 2.6.0.110021](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9524447),
15+
or a compatible update below 2.7.0.
16+
- [MMD OreSpawn 4.1.6.110021](https://www.curseforge.com/minecraft/mc-mods/mmd-orespawn/files/9518063),
17+
or a compatible 4.x update.
1318

14-
Trapdoors
19+
Base Metals supplies the shared library. A separate MMDLib jar is not needed.
1520

16-
Armor
21+
## Mining and trading
1722

18-
Tools: Crackhammers, Axes, Hoes, Pickaxes, Shovels, Fishing Rods
23+
Gem ores give XP when mined. Fortune can increase the gem yield, and Silk
24+
Touch lets you take the ore block home. Smiths buy and sell gems for
25+
emeralds, with rarer gems appearing as their careers advance.
1926

20-
Ores, Blocks, Ingots & Nuggets
27+
OreSpawn handles placement in the Overworld. Amber and moldavite turn up in
28+
shallow sediment pockets, while gems such as topaz and beryl tend to appear
29+
in short veins. Use OreSpawn's world settings to change where gems are found.
30+
Existing chunks stay as they are. [Where to find gems](docs/ORE_GENERATION.md)
2131

22-
Powders & Blends (Ingot and Nugget size)
32+
The ore overlays use Minecraft's stone texture underneath. If a resource pack
33+
changes stone, the background of the gem ores changes with it.
2334

24-
Rods
35+
## Configuration
2536

26-
Gears
37+
Open **Mods → Base Gems → Config** or choose **Base Gems** from OreSpawn's
38+
**Mods** list. Both screens save to `config/BaseGems.cfg`. Restart the game or
39+
server after changing Fantasy Level or switching a gem on or off.
2740

28-
Weapons: Swords, Bows, Arrows, Crossbows & Bolts
41+
**High Fantasy** is the default and gives you the full set of recipes.
42+
**Low Fantasy** keeps mining, trades, gem processing, plates and storage
43+
blocks. It removes recipes for things like ruby doors, gemstone gears and
44+
gem tools. Base Gems has its own Fantasy Level. Use the same setting on the
45+
server and client in multiplayer.
2946

30-
Materials
31-
---------
32-
[In Progress]
47+
## Mod compatibility
48+
49+
Other mods can use the Ore Dictionary names, such as `gemRuby`, `oreRuby`,
50+
`blockRuby` and `dustRuby`. In basePower's Normal mode, the shared gear
51+
entry lets gem gears stand in for sprockets in basePower, baseSteam and
52+
baseElectric recipes.
53+
54+
## Development and credits
55+
56+
The 1.10.2 branch uses ForgeGradle 7 and builds a Java 8 mod.
57+
See [building and Eclipse setup](docs/BUILDING.md) and the
58+
[changelog](CHANGELOG.txt).
59+
60+
The gem artwork comes from the 1.12.2 branch. Thanks to Aedda, Eejit,
61+
jmlovelace, KiriCattus and the Tinkers' Construct team for their work.
62+
[Artwork credits and licences](LICENSE-ART.txt)

0 commit comments

Comments
 (0)