Switch fluids to use mantles resource pack controlled textures

src/main/java/knightminer/inspirations/recipes/InspirationsRecipes.java

@@ -1,6 +1,5 @@
 package knightminer.inspirations.recipes;
 
-import knightminer.inspirations.Inspirations;
 import knightminer.inspirations.common.ModuleBase;
 import knightminer.inspirations.library.MiscUtil;
 import knightminer.inspirations.library.recipe.cauldron.CauldronContentTypes;
@@ -27,7 +26,6 @@
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.BowlFoodItem;
 import net.minecraft.world.item.BucketItem;
@@ -53,6 +51,7 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
 import slimeknights.mantle.registration.FluidBuilder;
+import slimeknights.mantle.registration.ModelFluidAttributes;
 import slimeknights.mantle.registration.adapter.BlockEntityTypeRegistryAdapter;
 import slimeknights.mantle.registration.adapter.BlockRegistryAdapter;
 import slimeknights.mantle.registration.adapter.FluidRegistryAdapter;
@@ -62,10 +61,6 @@
 
 @SuppressWarnings({"WeakerAccess", "unused"})
 public class InspirationsRecipes extends ModuleBase {
-  public static final ResourceLocation STILL_FLUID = Inspirations.getResource("block/fluid/colorless");
-  public static final ResourceLocation FLOWING_FLUID = Inspirations.getResource("block/fluid/colorless_flow");
-  public static final ResourceLocation STILL_TRANSPARENT = Inspirations.getResource("block/fluid/transparent");
-  public static final ResourceLocation FLOWING_TRANSPARENT = Inspirations.getResource("block/fluid/transparent_flow");
 
   // blocks
   public static Block fullAnvil;
@@ -115,19 +110,19 @@ public InspirationsRecipes() {
   void registerFluids(Register<Fluid> event) {
     FluidRegistryAdapter adapter = new FluidRegistryAdapter(event.getRegistry());
 
-    mushroomStew = adapter.register(new FluidBuilder(coloredFluid().color(0xFFCD8C6F).temperature(373).viscosity(1200))
+    mushroomStew = adapter.register(new FluidBuilder(fluidBuilder().temperature(373).viscosity(1200))
                                         .block(() -> mushroomStewBlock)
                                         .bucket(() -> mushroomStewBucket), "mushroom_stew");
-    beetrootSoup = adapter.register(new FluidBuilder(coloredFluid().color(0xFF84160D).temperature(373).viscosity(1100))
+    beetrootSoup = adapter.register(new FluidBuilder(fluidBuilder().temperature(373).viscosity(1100))
                                         .block(() -> beetrootSoupBlock)
                                         .bucket(() -> beetrootSoupBucket), "beetroot_soup");
-    rabbitStew = adapter.register(new FluidBuilder(coloredFluid().color(0xFF984A2C).temperature(373).viscosity(1400))
+    rabbitStew = adapter.register(new FluidBuilder(fluidBuilder().temperature(373).viscosity(1400))
                                       .block(() -> rabbitStewBlock)
                                       .bucket(() -> rabbitStewBucket), "rabbit_stew");
-    potatoSoup = adapter.register(new FluidBuilder(coloredFluid().color(0xFFF2DA9F).temperature(373).viscosity(1300))
+    potatoSoup = adapter.register(new FluidBuilder(fluidBuilder().temperature(373).viscosity(1300))
                                       .block(() -> potatoSoupBlock)
                                       .bucket(() -> potatoSoupBucket), "potato_soup");
-    honey = adapter.register(new FluidBuilder(FluidAttributes.builder(STILL_TRANSPARENT, FLOWING_TRANSPARENT).color(0xFFFF9116).viscosity(4000).temperature(373))
+    honey = adapter.register(new FluidBuilder(fluidBuilder().viscosity(4000).temperature(373))
                                       .block(() -> honeyFluidBlock)
                                       .bucket(() -> honeyBucket), "honey");
   }
@@ -265,11 +260,11 @@ void commonSetup(FMLCommonSetupEvent event) {
 //    }
   }
 
-  /**
-   * Creates a fluid attribute for the generic colorless fluid
-   * @return  Fluid attributes builder
-   */
-  private static FluidAttributes.Builder coloredFluid() {
-    return FluidAttributes.builder(STILL_FLUID, FLOWING_FLUID);
+
+  /* Helpers */
+
+  /** Creates a fluid builder */
+  private static FluidAttributes.Builder fluidBuilder() {
+    return ModelFluidAttributes.builder().sound(SoundEvents.BUCKET_FILL, SoundEvents.BUCKET_EMPTY);
   }
 }

src/main/java/knightminer/inspirations/recipes/RecipesClientEvents.java

@@ -28,7 +28,6 @@
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@@ -107,12 +106,4 @@ static void registerItemColors(ColorHandlerEvent.Item event) {
     InspirationsRecipes.simpleDyedWaterBottle.forEach((color, bottle) -> itemColors.register((stack, index) -> index == 0 ? MiscUtil.getColor(color) : -1, bottle));
     registerItemColors(itemColors, (stack, index) -> index == 0 ? MixedDyedBottleItem.dyeFromBottle(stack) : -1, InspirationsRecipes.mixedDyedWaterBottle);
   }
-
-  @SubscribeEvent
-  static void registerTextures(TextureStitchEvent.Pre event) {
-    if (InventoryMenu.BLOCK_ATLAS.equals(event.getAtlas().location())) {
-      event.addSprite(InspirationsRecipes.STILL_FLUID);
-      event.addSprite(InspirationsRecipes.FLOWING_FLUID);
-    }
-  }
 }

src/main/resources/assets/inspirations/blockstates/beetroot_soup_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "inspirations:block/fluid/colorless"
+            "model": "inspirations:block/fluid/beetroot_soup"
         }
     }
 }

src/main/resources/assets/inspirations/blockstates/honey_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "inspirations:block/fluid/transparent"
+            "model": "inspirations:block/fluid/honey"
         }
     }
 }

src/main/resources/assets/inspirations/blockstates/mushroom_stew_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "inspirations:block/fluid/colorless"
+            "model": "inspirations:block/fluid/mushroom_stew"
         }
     }
 }

src/main/resources/assets/inspirations/blockstates/potato_soup_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "inspirations:block/fluid/colorless"
+            "model": "inspirations:block/fluid/potato_soup"
         }
     }
 }

src/main/resources/assets/inspirations/blockstates/rabbit_stew_fluid.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "": {
-            "model": "inspirations:block/fluid/colorless"
+            "model": "inspirations:block/fluid/rabbit_stew"
         }
     }
 }

src/main/resources/assets/inspirations/models/block/fluid/beetroot_soup.json

@@ -0,0 +1,9 @@
+{
+  "loader": "mantle:fluid_texture",
+  "textures": {
+    "still": "inspirations:block/fluid/colorless",
+    "flowing": "inspirations:block/fluid/colorless_flow"
+  },
+  "color": "FF84160D"
+}
+

src/main/resources/assets/inspirations/models/block/fluid/honey.json

@@ -0,0 +1,9 @@
+{
+  "loader": "mantle:fluid_texture",
+  "textures": {
+    "still": "inspirations:block/fluid/transparent",
+    "flowing": "inspirations:block/fluid/transparent_flow"
+  },
+  "color": "FFFF9116"
+}
+

src/main/resources/assets/inspirations/models/block/fluid/mushroom_stew.json

@@ -0,0 +1,9 @@
+{
+  "loader": "mantle:fluid_texture",
+  "textures": {
+    "still": "inspirations:block/fluid/colorless",
+    "flowing": "inspirations:block/fluid/colorless_flow"
+  },
+  "color": "FFCD8C6F"
+}
+

src/main/resources/assets/inspirations/models/block/fluid/potato_soup.json

@@ -0,0 +1,9 @@
+{
+  "loader": "mantle:fluid_texture",
+  "textures": {
+    "still": "inspirations:block/fluid/colorless",
+    "flowing": "inspirations:block/fluid/colorless_flow"
+  },
+  "color": "FFF2DA9F"
+}
+

src/main/resources/assets/inspirations/models/block/fluid/rabbit_stew.json

@@ -0,0 +1,9 @@
+{
+  "loader": "mantle:fluid_texture",
+  "textures": {
+    "still": "inspirations:block/fluid/colorless",
+    "flowing": "inspirations:block/fluid/colorless_flow"
+  },
+  "color": "FF984A2C"
+}
+