Remove slotless salvage recipes, they do nothing

Leftover from when salvage returned items
SlimeKnights · Feb 2, 2023 · 7f11c81 · 7f11c81
1 parent 580151a
commit 7f11c81
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 48 deletions.
diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/draconic.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/draconic.json
diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/harmonious.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/harmonious.json
diff --git a/...rated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/resurrected.json b/...rated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/resurrected.json
diff --git a/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/worldbound.json b/...erated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/worldbound.json
diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/writable.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/salvage/slotless/writable.json
diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -177,7 +177,6 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
     String slotlessFolder = "tools/modifiers/slotless/";
     String upgradeSalvage = "tools/modifiers/salvage/upgrade/";
     String abilitySalvage = "tools/modifiers/salvage/ability/";
-    String slotlessSalvage = "tools/modifiers/salvage/slotless/";
     String defenseFolder = "tools/modifiers/defense/";
     String defenseSalvage = "tools/modifiers/salvage/defense/";
     String compatFolder = "tools/modifiers/compat/";
@@ -217,7 +216,6 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
     ModifierRecipeBuilder.modifier(ModifierIds.worldbound)
                          .addInput(TinkerTags.Items.INGOTS_NETHERITE_SCRAP)
                          .setMaxLevel(1)
-                         .saveSalvage(consumer, prefix(ModifierIds.worldbound, slotlessSalvage))
                          .save(consumer, prefix(ModifierIds.worldbound, slotlessFolder));
     ModifierRecipeBuilder.modifier(TinkerModifiers.soulbound)
                          .addInput(Ingredient.of(Items.TOTEM_OF_UNDYING, Items.NETHER_STAR))
@@ -1319,35 +1317,31 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
     ModifierRecipeBuilder.modifier(ModifierIds.writable)
                          .addInput(Items.WRITABLE_BOOK)
                          .setMaxLevel(1)
-                         .saveSalvage(consumer, prefix(ModifierIds.writable, slotlessSalvage))
                          .save(consumer, prefix(ModifierIds.writable, slotlessFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.harmonious)
                          .addInput(ItemTags.MUSIC_DISCS)
                          .setMaxLevel(1)
-                         .saveSalvage(consumer, prefix(ModifierIds.harmonious, slotlessSalvage))
                          .save(consumer, prefix(ModifierIds.harmonious, slotlessFolder));
-    ModifierRecipeBuilder.modifier(ModifierIds.recapitated) // you want your head back? that is gross!
+    ModifierRecipeBuilder.modifier(ModifierIds.recapitated)
                          .addInput(SizedIngredient.of(DifferenceIngredient.of(Ingredient.of(Tags.Items.HEADS), Ingredient.of(Items.DRAGON_HEAD))))
                          .setMaxLevel(1)
                          .save(consumer, prefix(ModifierIds.recapitated, slotlessFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.resurrected)
                          .addInput(Items.END_CRYSTAL)
                          .setMaxLevel(1)
-                         .saveSalvage(consumer, prefix(ModifierIds.resurrected, slotlessSalvage))
                          .save(consumer, prefix(ModifierIds.resurrected, slotlessFolder));
     ModifierRecipeBuilder.modifier(ModifierIds.draconic)
                          .addInput(Items.DRAGON_HEAD)
                          .setMaxLevel(1)
                          .save(consumer, wrap(ModifierIds.draconic, slotlessFolder, "_from_head"));
     ModifierRecipeBuilder.modifier(ModifierIds.draconic)
                          .addInput(Blocks.WITHER_ROSE)
-                         .addInput(TinkerModifiers.dragonScale) // you can apply the modifier in two ways, but scales are cheap so give them
+                         .addInput(TinkerModifiers.dragonScale)
                          .addInput(Blocks.WITHER_ROSE)
                          .addInput(TinkerModifiers.dragonScale)
                          .addInput(TinkerModifiers.dragonScale)
                          .setMaxLevel(1)
                          .disallowCrystal()
-                         .saveSalvage(consumer, prefix(ModifierIds.draconic, slotlessSalvage))
                          .save(consumer, wrap(ModifierIds.draconic, slotlessFolder, "_from_scales"));
     // creative
     SpecialRecipeBuilder.special(TinkerModifiers.creativeSlotSerializer.get()).save(consumer, modPrefix(slotlessFolder + "creative_slot"));