update (#2)

* Add JEI Info for where to get bonemeal from (DarkPacks#120) * Adjusts recipes from smelting orange apples/saplings to black instead. Moves into correct folder, and adds a in-lava recipe to make orange apples * Changes sand recipe from dye to use 1 brown 3 orange instead of 2 of each, fixes DarkPacks#63 (DarkPacks#149) * Give thermal copper and electrum nuggets/ingots instead of create's (DarkPacks#148) * Give Thermal copper and electrum nuggets instead of Create's * Fix mixing recipe to give thermal:electrum_ingot * Changes sag mill recipes to use Thermal's quartz dust instead of EnderIO's. (DarkPacks#142) * Warn about Ghast Cow (DarkPacks#136) * Replaces apple and salmon from bonus chest due to unlocking red stage (DarkPacks#140) --------- Co-authored-by: Dutchs <[email protected]> Co-authored-by: Darkosto <[email protected]> Co-authored-by: Christian <[email protected]>
Muddr · Jan 7, 2025 · 20587b9 · 20587b9
1 parent 2b3f378
commit 20587b9
Show file tree

Hide file tree

Showing 19 changed files with 341 additions and 4 deletions.
diff --git a/...inecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/ochrum.json b/...inecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/ochrum.json
@@ -0,0 +1,23 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "item": "create:ochrum"
+    }
+  ],
+  "results": [
+    {
+      "item": "create:crushed_raw_gold",
+      "chance": 0.2
+    },
+    {
+      "item": "minecraft:gold_nugget",
+      "chance": 0.2
+    },
+    {
+      "item": "thermal:electrum_nugget",
+      "chance": 0.2
+    }
+  ],
+  "processingTime": 250
+}
diff --git a/...lobal_packs/required_data/skyfactory_5/data/create/recipes/crushing/ochrum_recycling.json b/...lobal_packs/required_data/skyfactory_5/data/create/recipes/crushing/ochrum_recycling.json
@@ -0,0 +1,23 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "tag": "create:stone_types/ochrum"
+    }
+  ],
+  "results": [
+    {
+      "item": "create:crushed_raw_gold",
+      "chance": 0.2
+    },
+    {
+      "item": "minecraft:gold_nugget",
+      "chance": 0.2
+    },
+    {
+      "item": "thermal:electrum_nugget",
+      "chance": 0.2
+    }
+  ],
+  "processingTime": 250
+}
diff --git a/src/minecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/tuff.json b/src/minecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/tuff.json
@@ -0,0 +1,35 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "item": "minecraft:tuff"
+    }
+  ],
+  "results": [
+    {
+      "item": "minecraft:flint",
+      "chance": 0.25
+    },
+    {
+      "item": "minecraft:gold_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "thermal:copper_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "create:zinc_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "minecraft:iron_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "thermal:electrum_nugget",
+      "chance": 0.1
+    }
+  ],
+  "processingTime": 350
+}
diff --git a/.../global_packs/required_data/skyfactory_5/data/create/recipes/crushing/tuff_recycling.json b/.../global_packs/required_data/skyfactory_5/data/create/recipes/crushing/tuff_recycling.json
@@ -0,0 +1,35 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "tag": "create:stone_types/tuff"
+    }
+  ],
+  "results": [
+    {
+      "item": "minecraft:flint",
+      "chance": 0.25
+    },
+    {
+      "item": "minecraft:gold_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "thermal:copper_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "create:zinc_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "minecraft:iron_nugget",
+      "chance": 0.1
+    },
+    {
+      "item": "thermal:electrum_nugget",
+      "chance": 0.1
+    }
+  ],
+  "processingTime": 350
+}
diff --git a/...ecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/veridium.json b/...ecraft/global_packs/required_data/skyfactory_5/data/create/recipes/crushing/veridium.json
@@ -0,0 +1,19 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "item": "create:veridium"
+    }
+  ],
+  "processingTime": 250,
+  "results": [
+    {
+      "chance": 0.8,
+      "item": "create:crushed_raw_copper"
+    },
+    {
+      "chance": 0.8,
+      "item": "thermal:copper_nugget"
+    }
+  ]
+}
diff --git a/...bal_packs/required_data/skyfactory_5/data/create/recipes/crushing/veridium_recycling.json b/...bal_packs/required_data/skyfactory_5/data/create/recipes/crushing/veridium_recycling.json
@@ -0,0 +1,19 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "tag": "create:stone_types/veridium"
+    }
+  ],
+  "processingTime": 250,
+  "results": [
+    {
+      "chance": 0.8,
+      "item": "create:crushed_raw_copper"
+    },
+    {
+      "chance": 0.8,
+      "item": "thermal:copper_nugget"
+    }
+  ]
+}
diff --git a/...al_packs/required_data/skyfactory_5/data/create/recipes/splashing/crushed_raw_copper.json b/...al_packs/required_data/skyfactory_5/data/create/recipes/splashing/crushed_raw_copper.json
@@ -0,0 +1,18 @@
+{
+  "type": "create:splashing",
+  "ingredients": [
+    {
+      "item": "create:crushed_raw_copper"
+    }
+  ],
+  "results": [
+    {
+      "count": 9,
+      "item": "thermal:copper_nugget"
+    },
+    {
+      "chance": 0.5,
+      "item": "minecraft:clay_ball"
+    }
+  ]
+}
diff --git a/.../global_packs/required_data/skyfactory_5/data/createaddition/recipes/mixing/electrum.json b/.../global_packs/required_data/skyfactory_5/data/createaddition/recipes/mixing/electrum.json
@@ -0,0 +1,27 @@
+{
+  "type": "create:mixing",
+  "ingredients": [
+    {
+      "tag": "forge:ingots/gold"
+    },
+    {
+      "tag": "forge:ingots/silver"
+    }
+  ],
+  "results": [
+    {
+      "item": "thermal:electrum_ingot",
+      "count": 2
+    }
+  ],
+  "heatRequirement": "heated",
+  "conditions": [
+    {
+      "type": "forge:not",
+      "value": {
+        "type": "forge:tag_empty",
+        "tag": "forge:ingots/silver"
+      }
+    }
+  ]
+}
diff --git a/...raft/global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/quartz.json b/...raft/global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/quartz.json
@@ -0,0 +1,24 @@
+{
+  "type": "enderio:sag_milling",
+  "bonus": "chance_only",
+  "energy": 2400,
+  "input": {
+    "tag": "forge:gems/quartz"
+  },
+  "outputs": [
+    {
+      "chance": 1.0,
+      "item": {
+        "item": "thermal:quartz_dust"
+      },
+      "optional": false
+    },
+    {
+      "chance": 0.1,
+      "item": {
+        "item": "thermal:quartz_dust"
+      },
+      "optional": false
+    }
+  ]
+}
diff --git a/.../global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/quartz_ore.json b/.../global_packs/required_data/skyfactory_5/data/enderio/recipes/sag_milling/quartz_ore.json
@@ -0,0 +1,31 @@
+{
+  "type": "enderio:sag_milling",
+  "energy": 2400,
+  "input": {
+    "tag": "forge:ores/quartz"
+  },
+  "outputs": [
+    {
+      "chance": 1.0,
+      "item": {
+        "count": 2,
+        "item": "minecraft:quartz"
+      },
+      "optional": false
+    },
+    {
+      "chance": 0.1,
+      "item": {
+        "item": "thermal:quartz_dust"
+      },
+      "optional": false
+    },
+    {
+      "chance": 0.15,
+      "item": {
+        "item": "minecraft:netherrack"
+      },
+      "optional": false
+    }
+  ]
+}
diff --git a/...packs/required_data/skyfactory_5/data/minecraft/loot_tables/chests/spawn_bonus_chest.json b/...packs/required_data/skyfactory_5/data/minecraft/loot_tables/chests/spawn_bonus_chest.json
@@ -47,7 +47,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "minecraft:apple",
+          "name": "sf5_things:none_apple",
           "weight": 5
         },
         {
@@ -79,7 +79,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "minecraft:salmon",
+          "name": "minecraft:cod",
           "weight": 3
         }
       ],

diff --git a/...necraft/global_packs/required_data/skyfactory_5/data/skyfactory_5/jei_info/bone_meal.json b/...necraft/global_packs/required_data/skyfactory_5/data/skyfactory_5/jei_info/bone_meal.json
@@ -0,0 +1,8 @@
+{
+  "items": ["minecraft:bone_meal"],
+  "infos": [
+    {
+      "text": "Obtained from composting biological material in a composter"
+    }
+  ]
+}
diff --git a/...ta/skyfactory_5/recipes/lychee_recipes/in_lava_recipes/apple_in_lava_to_orange_apple.json b/...ta/skyfactory_5/recipes/lychee_recipes/in_lava_recipes/apple_in_lava_to_orange_apple.json
@@ -0,0 +1,25 @@
+{
+  "type": "lychee:item_inside",
+  "item_in": {
+    "tag": "skyfactory_5:color_apples"
+  },
+  "block_in": {
+    "blocks": ["minecraft:lava"]
+  },
+  "post": [
+    {
+      "type": "drop_item",
+      "item": "sf5_things:orange_apple"
+    },
+    {
+      "type": "execute",
+      "command": "particle minecraft:explosion ~ ~ ~",
+      "hide": true
+    },
+    {
+      "type": "execute",
+      "command": "playsound ars_nouveau:fire_family block @e[type=player,distance=..5] ~ ~ ~ 0.5",
+      "hide": true
+    }
+  ]
+}
diff --git a/...ipes/smelting/color_apples_to_orange.json → ...elting_recipes/color_apples_to_black.json b/...ipes/smelting/color_apples_to_orange.json → ...elting_recipes/color_apples_to_black.json
diff --git a/...es/smelting/color_saplings_to_orange.json → ...ting_recipes/color_saplings_to_black.json b/...es/smelting/color_saplings_to_orange.json → ...ting_recipes/color_saplings_to_black.json
@@ -6,5 +6,5 @@
   "ingredient": {
     "tag": "skyfactory_5:color_saplings"
   },
-  "result": "colouredstuff:sapling_orange"
+  "result": "colouredstuff:sapling_black"
 }
diff --git a/...ired_data/skyfactory_5/data/thermal/recipes/compat/create/pulverizer_create_veridium.json b/...ired_data/skyfactory_5/data/thermal/recipes/compat/create/pulverizer_create_veridium.json
@@ -0,0 +1,22 @@
+{
+  "type": "thermal:pulverizer",
+  "ingredient": {
+    "item": "create:veridium"
+  },
+  "result": [
+    {
+      "item": "create:crushed_raw_copper",
+      "chance": 0.8
+    },
+    {
+      "item": "thermal:copper_nugget",
+      "chance": 0.8
+    }
+  ],
+  "conditions": [
+    {
+      "type": "thermal:flag",
+      "flag": "mod_create"
+    }
+  ]
+}
diff --git a/...a/skyfactory_5/data/thermal/recipes/compat/create/pulverizer_create_veridium_recycle.json b/...a/skyfactory_5/data/thermal/recipes/compat/create/pulverizer_create_veridium_recycle.json
@@ -0,0 +1,22 @@
+{
+  "type": "thermal:pulverizer_recycle",
+  "ingredient": {
+    "tag": "create:stone_types/veridium"
+  },
+  "result": [
+    {
+      "item": "create:crushed_raw_copper",
+      "chance": 0.8
+    },
+    {
+      "item": "thermal:copper_nugget",
+      "chance": 0.8
+    }
+  ],
+  "conditions": [
+    {
+      "type": "thermal:flag",
+      "flag": "mod_create"
+    }
+  ]
+}
diff --git a/src/minecraft/scripts/resources/stone_blocks.zs b/src/minecraft/scripts/resources/stone_blocks.zs
@@ -25,7 +25,7 @@ craftingTable.addShapeless(
 craftingTable.addShapeless(
   "sand_from_dye",
   <item:minecraft:sand>,
-  [<tag:items:forge:dyes/brown>, <tag:items:forge:dyes/brown>, <tag:items:forge:dyes/orange>, <tag:items:forge:dyes/orange>]
+  [<tag:items:forge:dyes/brown>, <tag:items:forge:dyes/orange>, <tag:items:forge:dyes/orange>, <tag:items:forge:dyes/orange>]
 );
 
 // Obsidian

diff --git a/src/minecraft/scripts/tooltips.zs b/src/minecraft/scripts/tooltips.zs
@@ -160,3 +160,9 @@ import crafttweaker.api.text.Component;
 // Mystical Agriculture
   var inferium_essence = Component.literal("Dropped from Lime Leaves").setStyle(<constant:formatting:yellow>);
   <item:mysticalagriculture:inferium_essence>.addTooltip(inferium_essence);
+
+// Gateways
+
+var ghast_cow_gateway = Component.literal("Summons bosslike mob. Explodes like a Wither at the start").setStyle(<constant:formatting:red>);
+<item:gateways:gate_pearl>.withTag({gateway: "gateways:normal/ghast_cow"}).addTooltip(ghast_cow_gateway);
+<item:gateways:gate_pearl>.withTag({gateway: "gateways:titan/ghast_cow"}).addTooltip(ghast_cow_gateway);