Change some modifier recipes

Leaping now requires skyslime crystals to be nicer on the rabbits feet. Uses sky dirt if geodes disabled Soulbound now allows a netherstar as an alternative to a totem Draconic now no longer requires shulkers, just wither rose and dragon scales Remove membrane cost in offhanded
SlimeKnights · Jun 12, 2022 · ec39b17 · ec39b17
1 parent 97dda74
commit ec39b17
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 82 deletions.
diff --git a/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/strength.json b/...generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/strength.json
@@ -1,42 +1,11 @@
 {
-  "type": "forge:conditional",
-  "recipes": [
-    {
-      "conditions": [
-        {
-          "prop": "ichor_geodes",
-          "type": "tconstruct:config"
-        }
-      ],
-      "recipe": {
-        "type": "tconstruct:modifier_salvage",
-        "tools": {
-          "tag": "tconstruct:modifiable/armor/chestplate"
-        },
-        "slots": {
-          "abilities": 1
-        },
-        "modifier": "tconstruct:strength",
-        "min_level": 1
-      }
-    },
-    {
-      "conditions": [
-        {
-          "type": "forge:true"
-        }
-      ],
-      "recipe": {
-        "type": "tconstruct:modifier_salvage",
-        "tools": {
-          "tag": "tconstruct:modifiable/armor/chestplate"
-        },
-        "slots": {
-          "abilities": 1
-        },
-        "modifier": "tconstruct:strength",
-        "min_level": 1
-      }
-    }
-  ]
+  "type": "tconstruct:modifier_salvage",
+  "tools": {
+    "tag": "tconstruct:modifiable/armor/chestplate"
+  },
+  "slots": {
+    "abilities": 1
+  },
+  "modifier": "tconstruct:strength",
+  "min_level": 1
 }
diff --git a/...ated/resources/data/tconstruct/recipes/tools/modifiers/slotless/draconic_from_scales.json b/...ated/resources/data/tconstruct/recipes/tools/modifiers/slotless/draconic_from_scales.json
@@ -2,7 +2,7 @@
   "type": "tconstruct:modifier",
   "inputs": [
     {
-      "item": "minecraft:shulker_shell"
+      "item": "minecraft:wither_rose"
     },
     {
       "item": "tconstruct:dragon_scale"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/leaping.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/leaping.json
@@ -1,19 +1,56 @@
 {
-  "type": "tconstruct:incremental_modifier",
-  "input": {
-    "item": "minecraft:rabbit_foot"
-  },
-  "amount_per_item": 1,
-  "needed_per_level": 5,
-  "tools": {
-    "tag": "tconstruct:modifiable/armor/leggings"
-  },
-  "slots": {
-    "upgrades": 1
-  },
-  "result": {
-    "name": "tconstruct:leaping",
-    "level": 1
-  },
-  "max_level": 2
+  "type": "forge:conditional",
+  "recipes": [
+    {
+      "conditions": [
+        {
+          "prop": "sky_geodes",
+          "type": "tconstruct:config"
+        }
+      ],
+      "recipe": {
+        "type": "tconstruct:incremental_modifier",
+        "input": {
+          "item": "tconstruct:sky_slime_crystal"
+        },
+        "amount_per_item": 1,
+        "needed_per_level": 36,
+        "tools": {
+          "tag": "tconstruct:modifiable/armor/leggings"
+        },
+        "slots": {
+          "upgrades": 1
+        },
+        "result": {
+          "name": "tconstruct:leaping",
+          "level": 1
+        }
+      }
+    },
+    {
+      "conditions": [
+        {
+          "type": "forge:true"
+        }
+      ],
+      "recipe": {
+        "type": "tconstruct:incremental_modifier",
+        "input": {
+          "item": "tconstruct:sky_slime_dirt"
+        },
+        "amount_per_item": 1,
+        "needed_per_level": 18,
+        "tools": {
+          "tag": "tconstruct:modifiable/armor/leggings"
+        },
+        "slots": {
+          "upgrades": 1
+        },
+        "result": {
+          "name": "tconstruct:leaping",
+          "level": 1
+        }
+      }
+    }
+  ]
 }
diff --git a/...enerated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/offhanded_level_1.json b/...enerated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/offhanded_level_1.json
@@ -5,7 +5,7 @@
       "item": "minecraft:leather"
     },
     {
-      "item": "minecraft:phantom_membrane"
+      "item": "minecraft:fire_charge"
     },
     {
       "tag": "forge:slimeball/ichor"

diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/soulbound.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/upgrade/soulbound.json
@@ -2,7 +2,14 @@
   "type": "tconstruct:modifier",
   "inputs": [
     {
-      "item": "minecraft:totem_of_undying"
+      "ingredient": [
+        {
+          "item": "minecraft:totem_of_undying"
+        },
+        {
+          "item": "minecraft:nether_star"
+        }
+      ]
     }
   ],
   "tools": {

diff --git a/src/main/java/slimeknights/tconstruct/common/json/ConfigEnabledCondition.java b/src/main/java/slimeknights/tconstruct/common/json/ConfigEnabledCondition.java
@@ -129,4 +129,5 @@ public String toString() {
   public static final ConfigEnabledCondition GLASS_RECIPE_FIX = add("glass_recipe_fix", Config.COMMON.glassRecipeFix);
   public static final ConfigEnabledCondition FORCE_INTEGRATION_MATERIALS = add("force_integration_materials", Config.COMMON.forceIntegrationMaterials);
   public static final ConfigEnabledCondition ICHOR_GEODES = add("ichor_geodes", Config.COMMON.ichorGeodes);
+  public static final ConfigEnabledCondition SKY_GEODES = add("sky_geodes", Config.COMMON.skyGeodes);
 }
diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java
@@ -201,7 +201,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .saveSalvage(consumer, prefix(ModifierIds.worldbound, slotlessSalvage))
                          .save(consumer, prefix(ModifierIds.worldbound, slotlessFolder));
     ModifierRecipeBuilder.modifier(TinkerModifiers.soulbound)
-                         .addInput(Items.TOTEM_OF_UNDYING)
+                         .addInput(Ingredient.of(Items.TOTEM_OF_UNDYING, Items.NETHER_STAR))
                          .setSlots(SlotType.UPGRADE, 1)
                          .setMaxLevel(1)
                          .saveSalvage(consumer, prefix(TinkerModifiers.soulbound, upgradeSalvage))
@@ -284,7 +284,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
     ModifierRecipeBuilder.modifier(TinkerModifiers.offhanded)
                          .setTools(TinkerTags.Items.HELD)
                          .addInput(Items.LEATHER)
-                         .addInput(Items.PHANTOM_MEMBRANE)
+                         .addInput(Items.FIRE_CHARGE)
                          .addInput(SlimeType.ICHOR.getSlimeballTag())
                          .setMaxLevel(1)
                          .setSalvageLevelRange(1, 1)
@@ -653,13 +653,25 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .save(consumer, prefix(ModifierIds.knockbackArmor, upgradeFolder));
     // upgrade - leggings
     hasteRecipes(consumer, ModifierIds.speedy, Ingredient.of(TinkerTags.Items.LEGGINGS), 3, upgradeFolder, upgradeSalvage);
-    IncrementalModifierRecipeBuilder.modifier(TinkerModifiers.leaping)
-                         .setTools(TinkerTags.Items.LEGGINGS)
-                         .setInput(Items.RABBIT_FOOT, 1, 5)
-                         .setSlots(SlotType.UPGRADE, 1)
-                         .setMaxLevel(2)
-                         .saveSalvage(consumer, prefix(TinkerModifiers.leaping, upgradeSalvage))
-                         .save(consumer, prefix(TinkerModifiers.leaping, upgradeFolder));
+    // leaping lets you disable skyslime geodes in case you don't like fun
+    // if you are disabling both, you have a ton of recipes to fix anyways
+    IncrementalModifierRecipeBuilder leapGeodeBuilder =
+      IncrementalModifierRecipeBuilder.modifier(TinkerModifiers.leaping)
+                                      .setTools(TinkerTags.Items.LEGGINGS)
+                                      .setInput(TinkerWorld.skyGeode.asItem(), 1, 36)
+                                      .setSlots(SlotType.UPGRADE, 1);
+    IncrementalModifierRecipeBuilder leapNoGeodeBuilder =
+      IncrementalModifierRecipeBuilder.modifier(TinkerModifiers.leaping)
+                                      .setTools(TinkerTags.Items.LEGGINGS)
+                                      .setInput(TinkerWorld.slimeDirt.get(SlimeType.SKY), 1, 18)
+                                      .setSlots(SlotType.UPGRADE, 1);
+    ConditionalRecipe.builder()
+                     .addCondition(ConfigEnabledCondition.SKY_GEODES)
+                     .addRecipe(leapGeodeBuilder::save)
+                     .addCondition(TrueCondition.INSTANCE)
+                     .addRecipe(leapNoGeodeBuilder::save)
+                     .build(consumer, prefix(TinkerModifiers.leaping, upgradeFolder));
+    leapGeodeBuilder.saveSalvage(consumer, prefix(TinkerModifiers.leaping, upgradeSalvage));
     ModifierRecipeBuilder.modifier(ModifierIds.stepUp)
                          .setTools(TinkerTags.Items.LEGGINGS)
                          .addInput(Items.LEATHER)
@@ -771,29 +783,23 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .save(consumer, prefix(TinkerModifiers.unarmed, abilityFolder));
     // if ichor geodes are disabled (sadface), use ichor dirt instead for the recipe
     // if you are disabling both, you have a ton of recipes to fix anyways
-    IncrementalModifierRecipeBuilder geodeBuilder =
+    IncrementalModifierRecipeBuilder strengthGeodeBuilder =
         IncrementalModifierRecipeBuilder.modifier(ModifierIds.strength)
                                       .setTools(TinkerTags.Items.CHESTPLATES)
                                       .setInput(TinkerWorld.ichorGeode.asItem(), 1, 72)
                                       .setSlots(SlotType.ABILITY, 1);
-    IncrementalModifierRecipeBuilder noGeodeBuilder =
+    IncrementalModifierRecipeBuilder strengthNoGeodeBuilder =
       IncrementalModifierRecipeBuilder.modifier(ModifierIds.strength)
                                       .setTools(TinkerTags.Items.CHESTPLATES)
                                       .setInput(TinkerWorld.slimeDirt.get(SlimeType.ICHOR), 1, 36)
                                       .setSlots(SlotType.ABILITY, 1);
     ConditionalRecipe.builder()
                      .addCondition(ConfigEnabledCondition.ICHOR_GEODES)
-                     .addRecipe(geodeBuilder::save)
+                     .addRecipe(strengthGeodeBuilder::save)
                      .addCondition(TrueCondition.INSTANCE)
-                     .addRecipe(noGeodeBuilder::save)
+                     .addRecipe(strengthNoGeodeBuilder::save)
                      .build(consumer, prefix(ModifierIds.strength, abilityFolder));
-    // salvage needs to be a second recipe
-    ConditionalRecipe.builder()
-                     .addCondition(ConfigEnabledCondition.ICHOR_GEODES)
-                     .addRecipe(c -> geodeBuilder.saveSalvage(c, ModifierIds.strength))
-                     .addCondition(TrueCondition.INSTANCE)
-                     .addRecipe(c -> noGeodeBuilder.saveSalvage(c, ModifierIds.strength))
-                     .build(consumer, prefix(ModifierIds.strength, abilitySalvage));
+    strengthGeodeBuilder.saveSalvage(consumer, prefix(ModifierIds.strength, abilitySalvage));
 
     // leggings
     ModifierRecipeBuilder.modifier(TinkerModifiers.pockets)
@@ -1166,7 +1172,7 @@ private void addModifierRecipes(Consumer<FinishedRecipe> consumer) {
                          .setMaxLevel(1)
                          .save(consumer, wrap(ModifierIds.draconic, slotlessFolder, "_from_head"));
     ModifierRecipeBuilder.modifier(ModifierIds.draconic)
-                         .addInput(Items.SHULKER_SHELL)
+                         .addInput(Blocks.WITHER_ROSE)
                          .addInput(TinkerModifiers.dragonScale) // you can apply the modifier in two ways, but scales are cheap so give them
                          .addInput(Blocks.WITHER_ROSE)
                          .addInput(TinkerModifiers.dragonScale)

diff --git a/src/main/resources/assets/tconstruct/mantle/colors.json b/src/main/resources/assets/tconstruct/mantle/colors.json
@@ -124,7 +124,7 @@
     "feather_falling":  "#ffffff",
     "haste_armor":      "#7F0901",
     "knockback_armor":  "#BC9862",
-    "leaping":          "#D8B281",
+    "leaping":          "#01CBCD",
     "lightspeed_armor": "#FFBC5E",
     "item_frame":       "#7FB7D7",
     "pocket_chain":     "#FFBC5E",