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.

Sign up for GitHub

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

Fix cactus milling when Quark is installed. #7215

Open
wants to merge 1 commit into
base: mc1.20.1/dev
Choose a base branch
from
+6 −16
Open

Fix cactus milling when Quark is installed. #7215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-09-03T11:32:11.6637155 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.20.1 2024-12-15T23:26:23.3982685 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
Expand Down Expand Up @@ -585,8 +585,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
1195fdc4fb51659c921e2bbe744a35107f787aa2 assets/create/lang/en_ud.json
632d1aac7255fc0f4804f4df138ce9926134d2f9 assets/create/lang/en_us.json
5f729ba3f0557eb1c1923a091e06eee5ddf25c59 assets/create/lang/en_ud.json
bdd95ac05db0717d02e4dc34b6054e73d4eee640 assets/create/lang/en_us.json
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-10-09T12:24:59.1833995 Create's Processing Recipes
// 1.20.1 2024-12-15T23:26:23.3573034 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
Expand Down Expand Up @@ -764,7 +764,7 @@ d480b1b4c48440c6d6cb775321e95be7ea171aa5 data/create/recipes/milling/andesite.js
a3b4a9eb3970eea745dff83c2d5fbab403ed481f data/create/recipes/milling/blue_orchid.json
720ff9753bb30e874483fc850c3cbc8bfa973224 data/create/recipes/milling/bone.json
e84433fe6ec772c212d20109268fa74ceb8fa3ab data/create/recipes/milling/bone_meal.json
08771e9c43212ed8a378a7f4b2e5147ebe37fe0b data/create/recipes/milling/cactus.json
77b571f6ee4e8775d87077accdce4a23fb6a0c56 data/create/recipes/milling/cactus.json
d6073794b0be05fb52faf2d78d0daeb6ce3beab5 data/create/recipes/milling/calcite.json
5b6ccdbc1bf1dcc3fc3fca94ff1fa46c17f46622 data/create/recipes/milling/charcoal.json
6323f36ea7a1a46d0999dfe24e4fa86d677e319d data/create/recipes/milling/clay.json
Expand Down
9 changes: 0 additions & 9 deletions src/generated/resources/data/create/recipes/milling/cactus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{
"type": "create:milling",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:mod_loaded",
"modid": "quark"
}
}
],
"ingredients": [
{
"item": "minecraft:cactus"
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public class MillingRecipeGen extends ProcessingRecipeGen {

CACTUS = create(() -> Blocks.CACTUS, b -> b.duration(50)
.output(Items.GREEN_DYE, 2)
.output(.1f, Items.GREEN_DYE, 1)
.whenModMissing("quark")),
.output(.1f, Items.GREEN_DYE, 1)),

SEA_PICKLE = create(() -> Blocks.SEA_PICKLE, b -> b.duration(50)
.output(Items.LIME_DYE, 2)
Expand Down
Loading