Skip to content

Commit d599fca

Browse files
author
Doppel_R
committed
fix soph recipe using wrong tag, add framework for PAW compat, add deploying reciep for coarse dirt
1 parent dac6f27 commit d599fca

10 files changed

Lines changed: 56 additions & 6 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ dependencies {
196196
implementation("maven.modrinth:dzb1a5WV:lSnZyFnZ")
197197
// Dye Depot 2.1.0 so that colorful catalysts shuts up
198198
implementation("maven.modrinth:dye-depot:2.1.0")
199+
// Pantographs and Wires 0.2.3
200+
implementation("maven.modrinth:VzdCnMqW:CbRqaEft")
199201
//
200202
//implementation("MAVEN")
201203

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
// 1.21.1 2026-07-23T07:28:14.0716891 perfectprocessing's processing recipes: deploying
1+
// 1.21.1 2026-08-03T11:59:30.2166335 perfectprocessing's processing recipes: deploying
2+
583759c2713bd1dc2f9e2f86f2eefc3e76d8afe3 data/perfectprocessing/recipe/deploying/content/dirt_from_deploying_hoe.json
23
6620f16a4491d04635e874893e9245ba0fe9204d data/perfectprocessing/recipe/deploying/content/powder_snow_bucket_from_snow.json

‎src/generated/resources/.cache/237a5410978810995acd914fd61ee9253902f690‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2026-07-23T07:28:14.0404393 perfectprocessing's processing recipes: crushing
1+
// 1.21.1 2026-08-03T11:59:30.1951484 perfectprocessing's processing recipes: crushing
22
edb0bc3660221310a918800f32f834a1491695a0 data/perfectprocessing/recipe/crushing/content/cobbled_deepslate_from_deepslate.json
33
94f23aa519cc5691bf587d6f051e5413373abc56 data/perfectprocessing/recipe/crushing/content/compat/creatingspace/nickel_nugget_from_scorchia.json
44
973bed9ef2fd39604b28bb7e68fafbb56f004eda data/perfectprocessing/recipe/crushing/content/compat/northstar/rutile_concentrate_from_limestone.json
@@ -54,4 +54,4 @@ b1a095b582d9eb6b0d7fe9f57a43f5b76bd0ca69 data/perfectprocessing/recipe/crushing/
5454
bac7ab6147aa77df6123ad486848cd1e437ef7d4 data/perfectprocessing/recipe/crushing/recycling/sophisticated/backpacks.json
5555
dfaf3174841a693913e1a8b3c81705fe4a8407ac data/perfectprocessing/recipe/crushing/recycling/sophisticated/backpacks_value.json
5656
1587a981a6eab183f0bb0b00d685aeba982781f8 data/perfectprocessing/recipe/crushing/recycling/sophisticated/normal_upgrades.json
57-
f6171dda5d263c3e09c94152c6ed31443e7297ba data/perfectprocessing/recipe/crushing/recycling/sophisticated/special_upgrades.json
57+
db472b2be48b434c4e859ed0896d0d5b2198fea9 data/perfectprocessing/recipe/crushing/recycling/sophisticated/special_upgrades.json
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// 1.21.1 2026-07-23T07:28:14.0658305 perfectprocessing's processing recipes: filling
1+
// 1.21.1 2026-08-03T11:59:30.2137037 perfectprocessing's processing recipes: filling
2+
0ccc85a43d6b609a48b30a395c36f4fea922ddba data/perfectprocessing/recipe/filling/compat/paw/.json
23
15604cbac97101dee22b58dfcb54a000a6aaff1c data/perfectprocessing/recipe/filling/content/calcite_from_filling_diorite.json
34
c86a417d68d4ffed8616d722d0e592076495ab77 data/perfectprocessing/recipe/filling/content/deepslate_from_filling_flint_block.json
45
0ccc85a43d6b609a48b30a395c36f4fea922ddba data/perfectprocessing/recipe/filling/content/dripstone_from_filling_granite.json

‎src/generated/resources/data/perfectprocessing/recipe/crushing/recycling/sophisticated/special_upgrades.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "create:crushing",
1313
"ingredients": [
1414
{
15-
"tag": "perfectprocessing:sophisticated/backpacks_normal_upgrades"
15+
"tag": "perfectprocessing:sophisticated/backpacks_special_upgrades"
1616
}
1717
],
1818
"processing_time": 300,
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"neoforge:conditions": [
3+
{
4+
"type": "perfectprocessing:recipe_enabled",
5+
"flag": "hoeDirt"
6+
}
7+
],
8+
"type": "create:deploying",
9+
"ingredients": [
10+
{
11+
"item": "minecraft:coarse_dirt"
12+
},
13+
{
14+
"tag": "minecraft:hoes"
15+
}
16+
],
17+
"results": [
18+
{
19+
"id": "minecraft:dirt"
20+
}
21+
]
22+
}

‎src/main/java/dev/kalwantspizza/perfectprocessing/config/PBlocks.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ public class PBlocks extends ConfigBase {
88
public final ConfigBool fillDecorative = b(true, "fillDecorativeBlocks", Comments.fillDecorative, Comments.decorativeList, Comments.defaultTrue);
99
public final ConfigBool mixingProduce = b(true, "mixProductionalBlocks", Comments.mixingProduce, Comments.produceList, Comments.defaultTrue);
1010
public final ConfigBool spongeDupe = b(true, "duplicateSponges", Comments.spongeDupe, Comments.defaultTrue);
11+
public final ConfigBool pawOxidize = b(true, "oxidizeMasts", Comments.pawOxidize, Comments.pantoList, Comments.requiresPAW, Comments.defaultTrue);
12+
public final ConfigBool dirtHoe = b(true, "hoeCoarseDirt", Comments.dirtHoe, Comments.defaultTrue);
13+
1114

1215
@Override
1316
public String getName() {
@@ -20,10 +23,15 @@ private static class Comments {
2023
static String mixingProduce = "Whether the mixing recipes for productional blocks are enabled";
2124
static String spongeDupe = "Whether corals can be compacted into additional sponges";
2225
static String crushingDeepslate = "Whether deepslate can be crushed into cobbled deepslate";
26+
static String pawOxidize = "Whether weathering for masts from C: P&W is active";
27+
static String dirtHoe = "Whether or not deployers can use a hoe to make dirt";
2328

2429
static String decorativeList = "§dDecorative: §dBasalt, §dCalcite, §dDeepslate, §dDripstone";
2530
static String resourceList = "§dResource: §dAsurine, §dCrimsite, §dOchrum, §dVeridium";
2631
static String produceList = "§dProductional: §dDiorite, §dNetherrack, §dTuff";
32+
static String pantoList = "§dP&W: §dMasts §dfrom §dCreate: §dPantographs §dand §dWires";
33+
34+
static String requiresPAW = "§eRequires §emod §e'Create: §ePantographs §eand §eWires'";
2735

2836
static String defaultTrue = "§2Default: True";
2937
}

‎src/main/java/dev/kalwantspizza/perfectprocessing/config/PCommon.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,23 @@ public PCommon() {
2323
booleanFlags.put("zincCrushing", gems.ZincCrushing);
2424
modeFlags.put("ancientDebrisRecipe", gems.AncientDebrisRecipe);
2525
modeFlags.put("diamondRecipe", gems.DiamondRecipe);
26+
2627
booleanFlags.put("crushingDeepslate", blocks.crushingDeepslate);
2728
booleanFlags.put("compactResource", blocks.compactResource);
2829
booleanFlags.put("fillDecorative", blocks.fillDecorative);
2930
booleanFlags.put("mixingProduce", blocks.mixingProduce);
3031
booleanFlags.put("spongeDupe", blocks.spongeDupe);
3132
booleanFlags.put("legacyCasings", casings.legacyCasings);
33+
booleanFlags.put("pawOxidize", blocks.pawOxidize);
34+
booleanFlags.put("hoeDirt", blocks.dirtHoe);
35+
3236
booleanFlags.put("enderEyePolishing", items.enderEyePolishing);
3337
booleanFlags.put("magmaCreamHaunting", items.magmaCreamHaunting);
3438
booleanFlags.put("phantomMembraneHaunting", items.phantomMembraneHaunting);
3539
booleanFlags.put("powderedObsidianCrushing", items.powderedObsidianCrushing);
3640
booleanFlags.put("powderedSnowBucketDeploying", items.powderedSnowBucketDeploying);
3741
booleanFlags.put("rutileConcentrateCrushing", items.rutileConcentrateCrushing);
42+
3843
booleanFlags.put("armour", recycling.armour);
3944
booleanFlags.put("copycats", recycling.copycats);
4045
booleanFlags.put("sophisticatedBackpacks", recycling.sophisticatedBackpacks);

‎src/main/java/dev/kalwantspizza/perfectprocessing/datagen/recipes/PerfectCrushingRecipeGen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public class PerfectCrushingRecipeGen extends CrushingRecipeGen {
169169

170170
RECYCLE_SOPHISTICATED_SPECIAL_UPGRADES = create("recycling/sophisticated/special_upgrades", b -> b
171171
.duration(300)
172-
.require(ItemTags.SOPHISTICATED_NORMAL_UPGRADES)
172+
.require(ItemTags.SOPHISTICATED_SPECIAL_UPGRADES)
173173
.output(0.45f, ModItems.UPGRADE_BASE.get(), 1)
174174
.output(Items.NETHER_STAR, 1)
175175
.output(0.45f, Items.ENDER_EYE, 2)

‎src/main/java/dev/kalwantspizza/perfectprocessing/datagen/recipes/PerfectDeployingRecipeGen.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
import dev.kalwantspizza.perfectprocessing.config.RecipeEnabledCondition;
66
import net.minecraft.core.HolderLookup;
77
import net.minecraft.data.PackOutput;
8+
import net.minecraft.tags.ItemTags;
89
import net.minecraft.world.item.Items;
10+
import de.mrjulsen.paw.registry.ModBlocks;
911

12+
import java.util.List;
1013
import java.util.concurrent.CompletableFuture;
1114

1215
@SuppressWarnings("unused")
@@ -23,5 +26,13 @@ public PerfectDeployingRecipeGen(PackOutput output, CompletableFuture<HolderLook
2326
.output(Items.POWDER_SNOW_BUCKET)
2427
.withCondition(new RecipeEnabledCondition("powderedSnowBucketDeploying"))
2528

29+
),
30+
31+
DIRT_FROM_DEPLOYING_HOE = create("content/dirt_from_deploying_hoe", b -> b
32+
.require(Items.COARSE_DIRT)
33+
.require(ItemTags.HOES)
34+
.output(Items.DIRT)
35+
.withCondition(new RecipeEnabledCondition("hoeDirt"))
36+
2637
);
2738
}

0 commit comments

Comments
 (0)