Skip to content

Commit e44b5c7

Browse files
AlasDiabloAlasDiablo
committed
Add new basalt ore
1 parent 938d926 commit e44b5c7

File tree

196 files changed

+2410
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+2410
-301
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle'
1212
apply plugin: 'eclipse'
1313
apply plugin: 'maven-publish'
1414

15-
version = '4.4.0.46-experimental'
15+
version = '4.4.0.47-experimental'
1616
group = 'fr.alasdiablo.janoeo'
1717
archivesBaseName = 'Janoeo'
1818

@@ -56,7 +56,7 @@ minecraft {
5656
}
5757

5858
dependencies {
59-
minecraft 'net.minecraftforge:forge:1.16.1-32.0.69'
59+
minecraft 'net.minecraftforge:forge:1.16.1-32.0.98'
6060
}
6161

6262
jar {

‎changelog.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
### 4.4.0.47-experimental
2+
+ fix harvest level
3+
+ fix redstone ore always lit
4+
+ add new basalt ore
5+
+ diamond
6+
+ emerald
7+
+ coal
8+
+ gold
9+
+ iron
10+
+ lapis
11+
+ redstone
12+
113
### 4.4.0.46-experimental
214
+ rework world ore generation internal code
315
+ balancing the nether and end ore generation

‎src/generated/resources/.cache/cache‎

Lines changed: 182 additions & 154 deletions
Large diffs are not rendered by default.

‎src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:coal_basalt_blasting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_coal_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:coal_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:coal_basalt_blasting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_coal_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:coal_basalt_smelting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_coal_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:coal_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:coal_basalt_smelting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_coal_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:diamond_basalt_blasting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_diamond_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:diamond_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:diamond_basalt_blasting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_diamond_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:diamond_basalt_smelting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_diamond_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:diamond_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:diamond_basalt_smelting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_diamond_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:emerald_basalt_blasting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_emerald_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:emerald_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:emerald_basalt_blasting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_emerald_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:emerald_basalt_smelting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_emerald_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:emerald_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:emerald_basalt_smelting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_emerald_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

‎src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"minecraft:gold_basalt_blasting"
6+
]
7+
},
8+
"criteria": {
9+
"has_basalt_gold_ore": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"item": "janoeo:gold_basalt_ore"
15+
}
16+
]
17+
}
18+
},
19+
"has_the_recipe": {
20+
"trigger": "minecraft:recipe_unlocked",
21+
"conditions": {
22+
"recipe": "minecraft:gold_basalt_blasting"
23+
}
24+
}
25+
},
26+
"requirements": [
27+
[
28+
"has_basalt_gold_ore",
29+
"has_the_recipe"
30+
]
31+
]
32+
}

0 commit comments

Comments
 (0)