Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add AoA Ores to Miner #1175

Merged
merged 5 commits into from
Jul 29, 2024
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ mod_authors=Kli Kli
mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.

## Dependency Properties
jei_version=19.3.1.24
jei_version=19.3.1.25
jei_version_range=[19.3.1.0,)
curios_version=8.0.0-beta.4
curios_version_range=[8.0.0-beta.4,)
geckolib_minecraft_version=1.21
geckolib_version=4.5.5
geckolib_version=4.5.7
geckolib_version_range=[4.5.5,)
smartbrainlib_minecraft_version=1.21
smartbrainlib_version=1.14.5
Expand Down
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/baronyte.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:baronyte_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/blazium.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:blazium_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/bloodstone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:bloodstone_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:blue_gemstone_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:bone_fragments_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:charged_runium_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:crystallite_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/elecanium.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:elecanium_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/emberstone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:emberstone_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/gemenyte.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:gemenyte_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/ghastly.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:ghastly_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/ghoulish.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:ghoulish_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:green_gemstone_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/jade.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:jade_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/jewelyte.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:jewelyte_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/limonite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:limonite_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/lyon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:lyon_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/mystite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:mystite_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/ornamyte.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:ornamyte_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:purple_gemstone_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:red_gemstone_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/runium.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:runium_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/shyregem.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:shyregem_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/shyrestone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:shyrestone_ore",
"required": false
}
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/item/ores/varsium.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:varsium_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:white_gemstone_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "aoa3:yellow_gemstone_ore",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"neoforge:conditions": [
{
"type": "neoforge:not",
"value": {
"type": "neoforge:tag_empty",
"tag": "occultism:miners/ores"
}
},
{
"type": "neoforge:not",
"value": {
"type": "neoforge:tag_empty",
"tag": "c:ores/baronyte"
}
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_miner": {
"conditions": {
"items": [
{
"items": "occultism:magic_lamp_empty"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "occultism:miner/ores/baronyte_ore"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_miner"
]
],
"rewards": {
"recipes": [
"occultism:miner/ores/baronyte_ore"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"neoforge:conditions": [
{
"type": "neoforge:not",
"value": {
"type": "neoforge:tag_empty",
"tag": "occultism:miners/ores"
}
},
{
"type": "neoforge:not",
"value": {
"type": "neoforge:tag_empty",
"tag": "c:ores/blazium"
}
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_miner": {
"conditions": {
"items": [
{
"items": "occultism:magic_lamp_empty"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "occultism:miner/ores/blazium_ore"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_miner"
]
],
"rewards": {
"recipes": [
"occultism:miner/ores/blazium_ore"
]
}
}
Loading