Skip to content

Commit

Permalink
Fixes #18
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkosto committed Dec 17, 2024
1 parent 6eef125 commit 6c90bd9
Show file tree
Hide file tree
Showing 12 changed files with 183 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/deeps"
},
"result": {
"item": "thermal:deepslate_silver_ore"
},
"weight": 381
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "immersiveengineering:ore_aluminum"
},
"weight": 422
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:lead_ore"
},
"weight": 500
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:nickel_ore"
},
"weight": 232
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:niter_ore"
},
"weight": 244
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:silver_ore"
},
"weight": 381
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:sulfur_ore"
},
"weight": 222
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "thermal:tin_ore"
},
"weight": 602
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "occultism:miner",
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "immersiveengineering:ore_uranium"
},
"weight": 140
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "occultism:miner",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:tag_empty",
"tag": "forge:ores/zinc"
}
}
],
"ingredient": {
"tag": "occultism:miners/ores"
},
"result": {
"item": "create:zinc_ore"
},
"weight": 186
}
43 changes: 39 additions & 4 deletions src/minecraft/scripts/recipe_removals.zs
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,40 @@ val items as IItemStack[] = [

// Draconic Evolution
<item:draconicevolution:stabilized_spawner>,
<item:draconicevolution:mob_soul>


<item:draconicevolution:mob_soul>,

<item:ae2:fluix_axe>,
<item:ae2:fluix_hoe>,
<item:ae2:fluix_pickaxe>,
<item:ae2:fluix_shovel>,
<item:ae2:fluix_sword>,
<item:ae2:nether_quartz_axe>,
<item:ae2:nether_quartz_hoe>,
<item:ae2:nether_quartz_pickaxe>,
<item:ae2:nether_quartz_shovel>,
<item:ae2:nether_quartz_sword>,

<item:immersiveengineering:axe_steel>,
<item:immersiveengineering:hoe_steel>,
<item:immersiveengineering:pickaxe_steel>,
<item:immersiveengineering:shovel_steel>,
<item:immersiveengineering:sword_steel>,
<item:monsterplus:ancient_crystal>,
<item:monsterplus:crystal_arrow>,
<item:monsterplus:crystal_boots>,
<item:monsterplus:crystal_chestplate>,
<item:monsterplus:crystal_clump>,
<item:monsterplus:crystal_helmet>,
<item:monsterplus:crystal_leggings>,
<item:monsterplus:crystal_sword>,
<item:monsterplus:darkstar>,
<item:monsterplus:gnawing_jaw>,

// Occultism
<item:occultism:silver_ore>,
<item:occultism:silver_ore_deepslate>,
<item:occultism:silver_block>,
<item:occultism:raw_silver_block>

];

Expand Down Expand Up @@ -479,12 +510,16 @@ craftingTable.removeByName("minecraft:ens_netherrack");
craftingTable.removeByName("minecraft:ens_cobblestone");
craftingTable.removeByName("minecraft:ens_tuff");


// Cluttered mod
craftingTable.removeByName("luphieclutteredmod:luphie_purple_plank_set_stick_recipe");
craftingTable.removeByName("luphieclutteredmod:luphie_glow_wood_set_stick_recipe");

// Copper nuggets
craftingTable.removeByName("immersiveengineering:crafting/nugget_copper_to_copper_ingot");
craftingTable.removeByName("thermal:storage/copper_ingot_from_nuggets");
craftingTable.removeByName("create:crafting/materials/copper_ingot");

// //
// Attempts to remove Draconic Evolution Spawner Conversion
events.register<crafttweaker.forge.api.event.interact.RightClickBlockEvent>(event => {
val level = event.entity.level;
Expand Down
36 changes: 35 additions & 1 deletion src/minecraft/scripts/tags.zs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,41 @@ val itemsToRemove as IItemStack[] = [

// Draconic Evolution
<item:draconicevolution:stabilized_spawner>,
<item:draconicevolution:mob_soul>
<item:draconicevolution:mob_soul>,



<item:ae2:fluix_axe>,
<item:ae2:fluix_hoe>,
<item:ae2:fluix_pickaxe>,
<item:ae2:fluix_shovel>,
<item:ae2:fluix_sword>,
<item:ae2:nether_quartz_axe>,
<item:ae2:nether_quartz_hoe>,
<item:ae2:nether_quartz_pickaxe>,
<item:ae2:nether_quartz_shovel>,
<item:ae2:nether_quartz_sword>,
<item:immersiveengineering:axe_steel>,
<item:immersiveengineering:hoe_steel>,
<item:immersiveengineering:pickaxe_steel>,
<item:immersiveengineering:shovel_steel>,
<item:immersiveengineering:sword_steel>,
<item:monsterplus:ancient_crystal>,
<item:monsterplus:crystal_arrow>,
<item:monsterplus:crystal_boots>,
<item:monsterplus:crystal_chestplate>,
<item:monsterplus:crystal_clump>,
<item:monsterplus:crystal_helmet>,
<item:monsterplus:crystal_leggings>,
<item:monsterplus:crystal_sword>,
<item:monsterplus:darkstar>,
<item:monsterplus:gnawing_jaw>,

// Occultism
<item:occultism:silver_ore>,
<item:occultism:silver_ore_deepslate>,
<item:occultism:silver_block>,
<item:occultism:raw_silver_block>

];

Expand Down

0 comments on commit 6c90bd9

Please sign in to comment.