Slimy embellishment improvements

Now uses slimeballs instead of slimeblocks for the middle ingredient, so the total cost is 9 instead of 17
Slimy planks can now be used for earth and skyslime embellishments
Brought back blood embellishment, from bloodshroom planks. Just liked the palette too much to ditch it entirely

src/generated/resources/assets/tconstruct/tinkering/materials/blood.json

@@ -0,0 +1,46 @@
+{
+  "color": "B80000",
+  "generator": {
+    "ignoreMaterialStats": false,
+    "supportedStats": [
+      "tconstruct:slimesuit"
+    ],
+    "transformer": {
+      "type": "tconstruct:recolor_sprite",
+      "color_mapping": {
+        "type": "tconstruct:grey_to_color",
+        "palette": [
+          {
+            "color": "FF000000",
+            "grey": 0
+          },
+          {
+            "color": "FF5D0000",
+            "grey": 63
+          },
+          {
+            "color": "FF750000",
+            "grey": 102
+          },
+          {
+            "color": "FF820000",
+            "grey": 140
+          },
+          {
+            "color": "FFA00000",
+            "grey": 178
+          },
+          {
+            "color": "FFB80000",
+            "grey": 216
+          },
+          {
+            "color": "FFE82323",
+            "grey": 255
+          }
+        ]
+      }
+    }
+  },
+  "luminosity": 0
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_bloodshroom.json

@@ -0,0 +1,22 @@
+{
+  "type": "tconstruct:swappable_modifier",
+  "allow_crystal": false,
+  "inputs": [
+    {
+      "item": "tconstruct:bloodshroom_planks"
+    },
+    {
+      "item": "tconstruct:blood_slime_sapling"
+    },
+    {
+      "item": "tconstruct:bloodshroom_planks"
+    }
+  ],
+  "result": {
+    "name": "tconstruct:embellishment",
+    "value": "tconstruct:blood"
+  },
+  "tools": {
+    "tag": "tconstruct:modifiable/embellishment/slime"
+  }
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_earth.json

@@ -6,7 +6,7 @@
       "item": "tconstruct:earth_congealed_slime"
     },
     {
-      "item": "minecraft:slime_block"
+      "item": "minecraft:slime_ball"
     },
     {
       "item": "tconstruct:earth_congealed_slime"

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_ender.json

@@ -6,7 +6,7 @@
       "item": "tconstruct:ender_congealed_slime"
     },
     {
-      "item": "tconstruct:ender_slime"
+      "item": "tconstruct:ender_slime_ball"
     },
     {
       "item": "tconstruct:ender_congealed_slime"

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_greenheart.json

@@ -0,0 +1,22 @@
+{
+  "type": "tconstruct:swappable_modifier",
+  "allow_crystal": false,
+  "inputs": [
+    {
+      "item": "tconstruct:greenheart_planks"
+    },
+    {
+      "item": "tconstruct:earth_slime_sapling"
+    },
+    {
+      "item": "tconstruct:greenheart_planks"
+    }
+  ],
+  "result": {
+    "name": "tconstruct:embellishment",
+    "value": "tconstruct:earthslime"
+  },
+  "tools": {
+    "tag": "tconstruct:modifiable/embellishment/slime"
+  }
+}

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_ichor.json

@@ -6,7 +6,7 @@
       "item": "tconstruct:ichor_congealed_slime"
     },
     {
-      "item": "tconstruct:ichor_slime"
+      "item": "tconstruct:ichor_slime_ball"
     },
     {
       "item": "tconstruct:ichor_congealed_slime"

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_sky.json

@@ -6,7 +6,7 @@
       "item": "tconstruct:sky_congealed_slime"
     },
     {
-      "item": "tconstruct:sky_slime"
+      "item": "tconstruct:sky_slime_ball"
     },
     {
       "item": "tconstruct:sky_congealed_slime"

src/generated/resources/data/tconstruct/recipes/tools/modifiers/slotless/embellishment_skyroot.json

@@ -0,0 +1,22 @@
+{
+  "type": "tconstruct:swappable_modifier",
+  "allow_crystal": false,
+  "inputs": [
+    {
+      "item": "tconstruct:skyroot_planks"
+    },
+    {
+      "item": "tconstruct:sky_slime_sapling"
+    },
+    {
+      "item": "tconstruct:skyroot_planks"
+    }
+  ],
+  "result": {
+    "name": "tconstruct:embellishment",
+    "value": "tconstruct:skyslime"
+  },
+  "tools": {
+    "tag": "tconstruct:modifiable/embellishment/slime"
+  }
+}

src/generated/resources/data/tconstruct/tinkering/materials/definition/blood.json

@@ -1,7 +1,6 @@
 {
-  "redirect": [
-    {
-      "id": "tconstruct:magma"
-    }
-  ]
+  "craftable": true,
+  "hidden": false,
+  "sortOrder": 25,
+  "tier": 2
 }

src/generated/resources/data/tconstruct/tinkering/materials/stats/blood.json

@@ -0,0 +1,3 @@
+{
+  "stats": {}
+}

src/generated/resources/data/tconstruct/tinkering/materials/traits/blood.json

@@ -0,0 +1 @@
+{}

src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java

@@ -31,6 +31,7 @@
 import slimeknights.mantle.recipe.ingredient.FluidContainerIngredient;
 import slimeknights.mantle.recipe.ingredient.FluidIngredient;
 import slimeknights.mantle.recipe.ingredient.SizedIngredient;
+import slimeknights.mantle.registration.object.WoodBlockObject;
 import slimeknights.tconstruct.TConstruct;
 import slimeknights.tconstruct.common.TinkerTags;
 import slimeknights.tconstruct.common.data.BaseRecipeProvider;
@@ -77,6 +78,7 @@
 import slimeknights.tconstruct.tools.recipe.ModifierSortingRecipe;
 import slimeknights.tconstruct.world.TinkerHeadType;
 import slimeknights.tconstruct.world.TinkerWorld;
+import slimeknights.tconstruct.world.block.FoliageType;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
@@ -1638,10 +1640,16 @@ private void addTextureRecipes(Consumer<FinishedRecipe> consumer) {
     plateTexture(consumer, MaterialIds.brass,      true, folder);
 
     // slimesuit //
+    // basic slime
     slimeTexture(consumer, MaterialIds.earthslime, SlimeType.EARTH, folder);
     slimeTexture(consumer, MaterialIds.skyslime,   SlimeType.SKY, folder);
     slimeTexture(consumer, MaterialIds.ichor,      SlimeType.ICHOR, folder);
     slimeTexture(consumer, MaterialIds.enderslime, SlimeType.ENDER, folder);
+    // slimy planks
+    slimyWoodTexture(consumer, MaterialIds.earthslime, TinkerWorld.greenheart,  FoliageType.EARTH, folder);
+    slimyWoodTexture(consumer, MaterialIds.skyslime,   TinkerWorld.skyroot,     FoliageType.SKY,   folder);
+    slimyWoodTexture(consumer, MaterialIds.blood,      TinkerWorld.bloodshroom, FoliageType.BLOOD, folder);
+    // weird slime
     SwappableModifierRecipeBuilder.modifier(TinkerModifiers.embellishment, MaterialIds.clay.toString())
                                   .setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
                                   .addInput(Blocks.CLAY).addInput(Items.CLAY_BALL).addInput(Blocks.CLAY)
@@ -1754,10 +1762,19 @@ private void slimeTexture(Consumer<FinishedRecipe> consumer, MaterialId material
     ItemLike congealed = TinkerWorld.congealedSlime.get(slime);
     SwappableModifierRecipeBuilder.modifier(TinkerModifiers.embellishment, material.toString())
                                   .setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
-                                  .addInput(congealed).addInput(TinkerWorld.slime.get(slime)).addInput(congealed)
+                                  .addInput(congealed).addInput(TinkerCommons.slimeball.get(slime)).addInput(congealed)
                                   .save(consumer, wrap(TinkerModifiers.embellishment, folder, "_" + slime.getSerializedName()));
   }
 
+  /** Adds recipes for a slime armor texture */
+  private void slimyWoodTexture(Consumer<FinishedRecipe> consumer, MaterialId material, WoodBlockObject wood, FoliageType foliage, String folder) {
+    ItemLike planks = wood.get();
+    SwappableModifierRecipeBuilder.modifier(TinkerModifiers.embellishment, material.toString())
+                                  .setTools(TinkerTags.Items.EMBELLISHMENT_SLIME)
+                                  .addInput(planks).addInput(TinkerWorld.slimeSapling.get(foliage)).addInput(planks)
+                                  .save(consumer, wrap(TinkerModifiers.embellishment, folder, "_" + wood.getWoodType().name().split(":", 2)[1]));
+  }
+
   /** Adds haste like recipes using redstone */
   public void hasteRecipes(Consumer<FinishedRecipe> consumer, ModifierId modifier, Ingredient tools, int maxLevel, @Nullable String recipeFolder, @Nullable String salvageFolder) {
     IncrementalModifierRecipeBuilder builder = IncrementalModifierRecipeBuilder

src/main/java/slimeknights/tconstruct/tools/data/material/MaterialDataProvider.java

@@ -106,6 +106,7 @@ protected void addMaterials() {
     // slimesuit - textures
     addMaterial(MaterialIds.earthslime, 1, ORDER_REPAIR, true);
     addMaterial(MaterialIds.skyslime,   1, ORDER_REPAIR, true);
+    addMaterial(MaterialIds.blood,      2, ORDER_REPAIR, true);
     addMaterial(MaterialIds.magma,      2, ORDER_REPAIR, true);
     addMaterial(MaterialIds.ichor,      3, ORDER_REPAIR, true);
     addMaterial(MaterialIds.enderslime, 4, ORDER_REPAIR, true);
@@ -114,7 +115,5 @@ protected void addMaterials() {
     //addMaterial(MaterialIds.venom,      3, ORDER_REPAIR, true);
     // slimesuit - repair
     addMaterial(MaterialIds.phantom,    1, ORDER_REPAIR, true);
-
-    addRedirect(new MaterialId(TConstruct.MOD_ID, "blood"), redirect(MaterialIds.magma));
   }
 }

src/main/java/slimeknights/tconstruct/tools/data/material/MaterialIds.java

@@ -95,10 +95,10 @@ public final class MaterialIds {
   public static final MaterialId earthslime = id("earthslime");
   public static final MaterialId skyslime = id("skyslime");
   public static final MaterialId ichor = id("ichor");
+  public static final MaterialId blood = id("blood");
   public static final MaterialId magma = id("magma");
   public static final MaterialId clay = id("clay");
   public static final MaterialId honey = id("honey");
-  //public static final MaterialId venom = id("venom");
 
   /*
    * Variants

src/main/java/slimeknights/tconstruct/tools/data/material/MaterialRenderInfoProvider.java

@@ -112,6 +112,7 @@ protected void addMaterialRenderInfo() {
     // slimesuit
     buildRenderInfo(MaterialIds.earthslime);
     buildRenderInfo(MaterialIds.skyslime);
+    buildRenderInfo(MaterialIds.blood);
     buildRenderInfo(MaterialIds.magma);
     buildRenderInfo(MaterialIds.ichor);
     buildRenderInfo(MaterialIds.enderslime);

src/main/java/slimeknights/tconstruct/tools/data/material/MaterialStatsDataProvider.java

@@ -359,11 +359,11 @@ private void addMisc() {
     addMaterialStats(MaterialIds.netherite);
     addMaterialStats(MaterialIds.earthslime);
     addMaterialStats(MaterialIds.skyslime);
+    addMaterialStats(MaterialIds.blood);
     addMaterialStats(MaterialIds.magma);
     addMaterialStats(MaterialIds.ichor);
     addMaterialStats(MaterialIds.clay);
     addMaterialStats(MaterialIds.honey);
-    //addMaterialStats(MaterialIds.venom);
     // compat
     addMaterialStats(MaterialIds.aluminum);
     addMaterialStats(MaterialIds.nickel);

src/main/java/slimeknights/tconstruct/tools/data/material/MaterialTraitsDataProvider.java

@@ -113,6 +113,7 @@ protected void addMaterialTraits() {
     // slimesuit
     noTraits(MaterialIds.earthslime);
     noTraits(MaterialIds.skyslime);
+    noTraits(MaterialIds.blood);
     noTraits(MaterialIds.magma);
     noTraits(MaterialIds.ichor);
     noTraits(MaterialIds.enderslime);

src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerMaterialSpriteProvider.java

@@ -26,7 +26,6 @@ public String getName() {
   protected void addAllMaterials() {
     // TODO: this is a lovely red palette, reuse it for something in the future
     // GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF4A0000).addARGB(102, 0xFF5D0000).addARGB(140, 0xFF820000).addARGB(178, 0xFFA00000).addARGB(216, 0xFFB80000).addARGB(255, 0xFFE82323).build()
-    // GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF5D0000).addARGB(102, 0xFF750000).addARGB(140, 0xFF820000).addARGB(178, 0xFFA00000).addARGB(216, 0xFFB80000).addARGB(255, 0xFFE82323).build())
 
     // tier 1
     buildMaterial(MaterialIds.flint)
@@ -356,6 +355,9 @@ protected void addAllMaterials() {
     buildMaterial(MaterialIds.skyslime)
       .statType(TinkerPartSpriteProvider.SLIMESUIT)
       .colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF2F5351).addARGB(102, 0xFF3B6D6D).addARGB(140, 0xFF49807E).addARGB(178, 0xFF63ACAB).addARGB(216, 0xFF82D7D5).addARGB(255, 0xFFFFFFFF).build());
+    buildMaterial(MaterialIds.blood)
+      .statType(TinkerPartSpriteProvider.SLIMESUIT)
+      .colorMapper(GreyToColorMapping.builderFromBlack().addARGB(63, 0xFF5D0000).addARGB(102, 0xFF750000).addARGB(140, 0xFF820000).addARGB(178, 0xFFA00000).addARGB(216, 0xFFB80000).addARGB(255, 0xFFE82323).build());
     buildMaterial(MaterialIds.magma) // note the non-standard grey values, as we are targeting the slime armor directly
       .statType(TinkerPartSpriteProvider.SLIMESUIT)
       .colorMapper(GreyToColorMapping.builderFromBlack().addARGB(140, 0xFFCA4E06).addARGB(155, 0xFFE66410).addARGB(170, 0xFF411616).addARGB(193, 0xFF501B1B).addARGB(216, 0xFF652828).addARGB(236, 0xFF411616).build());

src/main/resources/assets/tconstruct/lang/en_us.json

@@ -1593,6 +1593,7 @@
   "material.tconstruct.netherite":  "Netherite",
   "material.tconstruct.earthslime": "Earthslime",
   "material.tconstruct.skyslime":   "Skyslime",
+  "material.tconstruct.blood":      "Blood",
   "material.tconstruct.magma":      "Magma",
   "material.tconstruct.ichor":      "Ichor",
   "material.tconstruct.enderslime": "Enderslime",

src/main/resources/assets/tconstruct/mantle/colors.json

@@ -369,6 +369,7 @@
     "earthslime": "#01cd4e",
     "skyslime":   "#01cbcd",
     "blood":      "#b50101",
+    "magma":      "#652828",
     "ichor":      "#ff970d",
     "enderslime": "#af4cf6",
     "clay":       "#AFB9D6",