Skip to content

Commit

Permalink
feat: The Raw Update (#1001)
Browse files Browse the repository at this point in the history
Crushing raw ores blocks
Tiered miners recipe
Increase spirits life
Minor fix

Closes #988
Closes #991 

Big thanks to @Eqis-Edu!
  • Loading branch information
Eqis-Edu authored and klikli-dev committed Nov 27, 2023
1 parent 6fac152 commit e14f076
Show file tree
Hide file tree
Showing 90 changed files with 1,734 additions and 25 deletions.
2 changes: 2 additions & 0 deletions src/generated/resources/assets/occultism/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"block.occultism.otherworld_leaves": "Otherworld Leaves",
"block.occultism.otherworld_log": "Otherworld Wood",
"block.occultism.otherworld_sapling": "Otherworld Sapling",
"block.occultism.raw_iesnium_block": "Block of Raw Iesnium",
"block.occultism.raw_silver_block": "Block of Raw Silver",
"block.occultism.sacrificial_bowl": "Sacrificial Bowl",
"block.occultism.silver_block": "Block of Silver",
"block.occultism.silver_ore": "Silver Ore",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "occultism:raw_iesnium_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "occultism:blocks/raw_iesnium_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "occultism:raw_silver_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "occultism:blocks/raw_silver_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:storage_blocks/raw_allthemodium"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/allthemodium"
}
}
],
"crushing_time": 1600,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:storage_blocks/raw_allthemodium"
},
"result": {
"count": 18,
"tag": "forge:dusts/allthemodium"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:storage_blocks/raw_aluminum"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/aluminum"
}
}
],
"crushing_time": 1600,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:storage_blocks/raw_aluminum"
},
"result": {
"count": 18,
"tag": "forge:dusts/aluminum"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:gems/amber"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/amber"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": true,
"ingredient": {
"tag": "forge:gems/amber"
},
"result": {
"count": 1,
"tag": "forge:dusts/amber"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:gems/apatite"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/apatite"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": true,
"ingredient": {
"tag": "forge:gems/apatite"
},
"result": {
"count": 1,
"tag": "forge:dusts/apatite"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:ores/arcane_crystal"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/arcane_crystal"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:ores/arcane_crystal"
},
"result": {
"count": 4,
"tag": "forge:dusts/arcane_crystal"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:gems/arcane_crystal"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/arcane_crystal"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": true,
"ingredient": {
"tag": "forge:gems/arcane_crystal"
},
"result": {
"count": 1,
"tag": "forge:dusts/arcane_crystal"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:storage_blocks/raw_azure_silver"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/azure_silver"
}
}
],
"crushing_time": 1600,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:storage_blocks/raw_azure_silver"
},
"result": {
"count": 18,
"tag": "forge:dusts/azure_silver"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:storage_blocks/raw_brass"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/brass"
}
}
],
"crushing_time": 1600,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:storage_blocks/raw_brass"
},
"result": {
"count": 18,
"tag": "forge:dusts/brass"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:storage_blocks/raw_bronze"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/bronze"
}
}
],
"crushing_time": 1600,
"ignore_crushing_multiplier": false,
"ingredient": {
"tag": "forge:storage_blocks/raw_bronze"
},
"result": {
"count": 18,
"tag": "forge:dusts/bronze"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:gems/certus_quartz"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/certus_quartz"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": true,
"ingredient": {
"tag": "forge:gems/certus_quartz"
},
"result": {
"count": 1,
"tag": "forge:dusts/certus_quartz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "occultism:crushing",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:gems/charged_certus_quartz"
}
},
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:dusts/charged_certus_quartz"
}
}
],
"crushing_time": 200,
"ignore_crushing_multiplier": true,
"ingredient": {
"tag": "forge:gems/charged_certus_quartz"
},
"result": {
"count": 1,
"tag": "forge:dusts/charged_certus_quartz"
}
}
Loading

0 comments on commit e14f076

Please sign in to comment.