New slimesteel textures, organize other textures

New slimesteel block, ingot, and nugget credit to LethalChicken

Storage blocks are all under textures/block/storage now, and the models under models/block/storage
Fluids are under unique folders
Removed milk, slimy mud

src/main/java/slimeknights/tconstruct/fluids/FluidIcons.java

@@ -5,21 +5,26 @@
 
 public class FluidIcons {
 
-  public static final ResourceLocation LIQUID_STILL = Util.getResource("block/fluid/liquid_still");
-  public static final ResourceLocation LIQUID_FLOWING = Util.getResource("block/fluid/liquid_flowing");
+  public static final ResourceLocation LIQUID_STILL = texture("liquid", false);
+  public static final ResourceLocation LIQUID_FLOWING = texture("liquid", true);
 
-  public static final ResourceLocation MOLTEN_STILL = Util.getResource("block/fluid/molten_still");
-  public static final ResourceLocation MOLTEN_FLOWING = Util.getResource("block/fluid/molten_flowing");
+  public static final ResourceLocation MOLTEN_STILL = texture("molten", false);
+  public static final ResourceLocation MOLTEN_FLOWING = texture("molten", true);
 
-  public static final ResourceLocation MILK_STILL = Util.getResource("block/fluid/milk_still");
-  public static final ResourceLocation MILK_FLOWING = Util.getResource("block/fluid/milk_flowing");
+  public static final ResourceLocation STONE_STILL = texture("stone", false);
+  public static final ResourceLocation STONE_FLOWING = texture("stone", true);
 
-  public static final ResourceLocation STONE_STILL = Util.getResource("block/fluid/stone_still");
-  public static final ResourceLocation STONE_FLOWING = Util.getResource("block/fluid/stone_flowing");
+  public static final ResourceLocation BLAZE_STILL = texture("blaze", false);
+  public static final ResourceLocation BLAZE_FLOWING = texture("blaze", true);
 
-  public static final ResourceLocation BLAZE_STILL = Util.getResource("block/fluid/blaze_still");
-  public static final ResourceLocation BLAZE_FLOWING = Util.getResource("block/fluid/blaze_flowing");
+  public static final ResourceLocation MAGMA_CREAM_STILL = texture("magma_cream", false);
+  public static final ResourceLocation MAGMA_CREAM_FLOWING = texture("magma_cream", true);
 
-  public static final ResourceLocation MAGMA_CREAM_STILL = Util.getResource("block/fluid/magma_cream_still");
-  public static final ResourceLocation MAGMA_CREAM_FLOWING = Util.getResource("block/fluid/magma_cream_flowing");
+  public static final ResourceLocation SLIMESTEEL_STILL = texture("slimesteel", false);
+  public static final ResourceLocation SLIMESTEEL_FLOWING = texture("slimesteel", true);
+
+  /** Makes a texture for this class */
+  private static ResourceLocation texture(String name, boolean flowing) {
+    return Util.getResource("block/fluid/" + name + (flowing ? "/flowing" : "/still"));
+  }
 }

src/main/java/slimeknights/tconstruct/fluids/TinkerFluids.java

@@ -61,7 +61,7 @@ public TinkerFluids() {
   public static final FluidObject<ForgeFlowingFluid> moltenCobalt = FLUIDS.register("molten_cobalt", moltenBuilder().color(0xff2376dd).temperature(1250), Material.LAVA, 10);
   public static final FluidObject<ForgeFlowingFluid> moltenDebris = FLUIDS.register("molten_debris", moltenBuilder().color(0xff5d342c).temperature(1475), Material.LAVA,  9);
   // alloys
-  public static final FluidObject<ForgeFlowingFluid> moltenSlimesteel    = FLUIDS.register("molten_slimesteel",     moltenBuilder().color(0xffb3e0dc).temperature(1200), Material.LAVA, 10);
+  public static final FluidObject<ForgeFlowingFluid> moltenSlimesteel    = FLUIDS.register("molten_slimesteel",     hotBuilder(FluidIcons.SLIMESTEEL_STILL, FluidIcons.SLIMESTEEL_FLOWING).color(0xffb3e0dc).temperature(1200), Material.LAVA, 10);
   public static final FluidObject<ForgeFlowingFluid> moltenTinkersBronze = FLUIDS.register("molten_tinkers_bronze", moltenBuilder().color(0xfff9cf72).temperature(1000), Material.LAVA, 12);
   public static final FluidObject<ForgeFlowingFluid> moltenRoseGold      = FLUIDS.register("molten_rose_gold",      moltenBuilder().color(0xfff7cdbb).temperature( 850), Material.LAVA, 12);
   public static final FluidObject<ForgeFlowingFluid> moltenPigIron       = FLUIDS.register("molten_pig_iron",       moltenBuilder().color(0xfff0a8a4).temperature(1111), Material.LAVA, 10);

src/main/java/slimeknights/tconstruct/shared/CommonsClientEvents.java

@@ -37,6 +37,7 @@ static void clientSetup(final FMLClientSetupEvent event) {
     RenderTypeLookup.setRenderLayer(TinkerCommons.soulGlass.get(), RenderType.getTranslucent());
     RenderTypeLookup.setRenderLayer(TinkerCommons.soulGlassPane.get(), RenderType.getTranslucent());
     RenderTypeLookup.setRenderLayer(TinkerMaterials.soulsteel.get(), RenderType.getTranslucent());
+    RenderTypeLookup.setRenderLayer(TinkerMaterials.slimesteel.get(), RenderType.getTranslucent());
 
     FontRenderer unicode = unicodeFontRender();
     TinkerBook.MATERIALS_AND_YOU.fontRenderer = unicode;

src/main/java/slimeknights/tconstruct/shared/TinkerMaterials.java

@@ -20,20 +20,21 @@
  */
 @SuppressWarnings("unused")
 public final class TinkerMaterials extends TinkerModule {
+  private static final Block.Properties TRANSPARENT_METAL = builder(Material.IRON, ToolType.PICKAXE, SoundType.METAL).setRequiresTool().hardnessAndResistance(5.0f).notSolid();
+
   // ores
   public static final MetalItemObject copper = BLOCKS.registerMetal("copper", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject cobalt = BLOCKS.registerMetal("cobalt", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   // tier 3
-  public static final MetalItemObject slimesteel    = BLOCKS.registerMetal("slimesteel", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
+  public static final MetalItemObject slimesteel    = BLOCKS.registerMetal("slimesteel", TRANSPARENT_METAL, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject tinkersBronze = BLOCKS.registerMetal("tinkers_bronze", "silicon_bronze", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject roseGold      = BLOCKS.registerMetal("rose_gold", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject pigIron       = BLOCKS.registerMetal("pig_iron", () -> new OrientableBlock(GENERIC_METAL_BLOCK), GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   // tier 4
-  private static final Block.Properties SOUL_STEEL = builder(Material.IRON, ToolType.PICKAXE, SoundType.METAL).setRequiresTool().hardnessAndResistance(5.0f).notSolid();
   public static final MetalItemObject queensSlime = BLOCKS.registerMetal("queens_slime", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject manyullyn   = BLOCKS.registerMetal("manyullyn", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
   public static final MetalItemObject hepatizon   = BLOCKS.registerMetal("hepatizon", GENERIC_METAL_BLOCK, GENERAL_TOOLTIP_BLOCK_ITEM, GENERAL_PROPS);
-  public static final MetalItemObject soulsteel   = BLOCKS.registerMetal("soulsteel", SOUL_STEEL, HIDDEN_BLOCK_ITEM, HIDDEN_PROPS);
+  public static final MetalItemObject soulsteel   = BLOCKS.registerMetal("soulsteel", TRANSPARENT_METAL, HIDDEN_BLOCK_ITEM, HIDDEN_PROPS);
   public static final ItemObject<Item> netheriteNugget = ITEMS.register("netherite_nugget", GENERAL_PROPS);
   public static final ItemObject<Item> debrisNugget = ITEMS.register("debris_nugget", TOOLTIP_ITEM);
   // tier 5

src/main/resources/assets/tconstruct/blockstates/cobalt_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/cobalt_block"
+            "model": "tconstruct:block/storage/cobalt"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/copper_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/copper_block"
+            "model": "tconstruct:block/storage/copper"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/hepatizon_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/hepatizon_block"
+            "model": "tconstruct:block/storage/hepatizon"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/knightslime_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/knightslime_block"
+            "model": "tconstruct:block/storage/knightslime"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/manyullyn_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/manyullyn_block"
+            "model": "tconstruct:block/storage/manyullyn"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/molten_slimesteel_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/fluid/molten"
+            "model": "tconstruct:block/fluid/slimesteel"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/pig_iron_block.json

@@ -1,8 +1,8 @@
 {
   "variants": {
-    "facing=north": { "model": "tconstruct:block/pig_iron_block" },
-    "facing=south": { "model": "tconstruct:block/pig_iron_block", "y": 180 },
-    "facing=west":  { "model": "tconstruct:block/pig_iron_block", "y": 270 },
-    "facing=east":  { "model": "tconstruct:block/pig_iron_block", "y": 90 }
+    "facing=north": { "model": "tconstruct:block/storage/pig_iron" },
+    "facing=south": { "model": "tconstruct:block/storage/pig_iron", "y": 180 },
+    "facing=west":  { "model": "tconstruct:block/storage/pig_iron", "y": 270 },
+    "facing=east":  { "model": "tconstruct:block/storage/pig_iron", "y": 90 }
   }
 }

src/main/resources/assets/tconstruct/blockstates/queens_slime_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/queens_slime_block"
+            "model": "tconstruct:block/storage/queens_slime"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/rose_gold_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/rose_gold_block"
+            "model": "tconstruct:block/storage/rose_gold"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/silky_jewel_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/silky_jewel_block"
+            "model": "tconstruct:block/storage/silky_jewel"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/slimesteel_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/slimesteel_block"
+            "model": "tconstruct:block/storage/slimesteel"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/soulsteel_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/soulsteel_block"
+            "model": "tconstruct:block/storage/soulsteel"
         }
     }
 }

src/main/resources/assets/tconstruct/blockstates/tinkers_bronze_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "tconstruct:block/tinkers_bronze_block"
+            "model": "tconstruct:block/storage/tinkers_bronze"
         }
     }
 }

src/main/resources/assets/tconstruct/models/block/cobalt_frame.json

@@ -1,8 +1,8 @@
 {
     "parent": "tconstruct:block/fancy_item_frame",
     "textures": {
-        "particle": "tconstruct:block/cobalt_block",
-        "wood": "tconstruct:block/cobalt_block",
+        "particle": "tconstruct:block/storage/cobalt",
+        "wood": "tconstruct:block/storage/cobalt",
         "back": "tconstruct:block/item_frame_background"
     }
 }

src/main/resources/assets/tconstruct/models/block/cobalt_frame_map.json

@@ -1,8 +1,8 @@
 {
     "parent": "minecraft:block/item_frame_map",
     "textures": {
-        "particle": "tconstruct:block/cobalt_block",
-        "wood": "tconstruct:block/cobalt_block",
+        "particle": "tconstruct:block/storage/cobalt",
+        "wood": "tconstruct:block/storage/cobalt",
         "back": "tconstruct:block/item_frame_background"
     }
 }

src/main/resources/assets/tconstruct/models/block/fluid/blaze.json

@@ -1,6 +1,6 @@
 {
     "textures": {
-        "particle": "tconstruct:block/fluid/blaze_still"
+        "particle": "tconstruct:block/fluid/blaze/still"
     }
 }
 

src/main/resources/assets/tconstruct/models/block/fluid/liquid.json

@@ -1,6 +1,6 @@
 {
     "textures": {
-        "particle": "tconstruct:block/fluid/liquid_still"
+        "particle": "tconstruct:block/fluid/liquid/still"
     }
 }
 

src/main/resources/assets/tconstruct/models/block/fluid/magma_cream.json

@@ -1,6 +1,6 @@
 {
     "textures": {
-        "particle": "tconstruct:block/fluid/magma_cream_still"
+        "particle": "tconstruct:block/fluid/magma_cream/still"
     }
 }
 

src/main/resources/assets/tconstruct/models/block/fluid/molten.json

@@ -1,6 +1,6 @@
 {
     "textures": {
-        "particle": "tconstruct:block/fluid/molten_still"
+        "particle": "tconstruct:block/fluid/molten/still"
     }
 }
 

src/main/resources/assets/tconstruct/models/block/fluid/slimesteel.json

@@ -0,0 +1,6 @@
+{
+    "textures": {
+        "particle": "tconstruct:block/fluid/slimesteel/still"
+    }
+}
+

src/main/resources/assets/tconstruct/models/block/fluid/stone.json

@@ -1,6 +1,6 @@
 {
     "textures": {
-        "particle": "tconstruct:block/fluid/stone_still"
+        "particle": "tconstruct:block/fluid/stone/still"
     }
 }
 

src/main/resources/assets/tconstruct/models/block/jewel_frame.json

@@ -1,8 +1,8 @@
 {
     "parent": "tconstruct:block/fancy_item_frame",
     "textures": {
-        "particle": "tconstruct:block/silky_jewel_block",
-        "wood": "tconstruct:block/silky_jewel_block",
+        "particle": "tconstruct:block/storage/silky_jewel",
+        "wood": "tconstruct:block/storage/silky_jewel",
         "back": "tconstruct:block/item_frame_background"
     }
 }

src/main/resources/assets/tconstruct/models/block/jewel_frame_map.json

@@ -1,8 +1,8 @@
 {
     "parent": "minecraft:block/item_frame_map",
     "textures": {
-        "particle": "tconstruct:block/silky_jewel_block",
-        "wood": "tconstruct:block/silky_jewel_block",
+        "particle": "tconstruct:block/storage/silky_jewel",
+        "wood": "tconstruct:block/storage/silky_jewel",
         "back": "tconstruct:block/item_frame_background"
     }
 }

src/main/resources/assets/tconstruct/models/block/manyullyn_frame.json

@@ -1,8 +1,8 @@
 {
     "parent": "tconstruct:block/fancy_item_frame",
     "textures": {
-        "particle": "tconstruct:block/manyullyn_block",
-        "wood": "tconstruct:block/manyullyn_block",
+        "particle": "tconstruct:block/storage/manyullyn",
+        "wood": "tconstruct:block/storage/manyullyn",
         "back": "tconstruct:block/item_frame_background"
     }
 }

src/main/resources/assets/tconstruct/models/block/manyullyn_frame_map.json

@@ -1,8 +1,8 @@
 {
     "parent": "minecraft:block/item_frame_map",
     "textures": {
-        "particle": "tconstruct:block/manyullyn_block",
-        "wood": "tconstruct:block/manyullyn_block",
+        "particle": "tconstruct:block/storage/manyullyn",
+        "wood": "tconstruct:block/storage/manyullyn",
         "back": "tconstruct:block/item_frame_background"
     }
 }