diff --git a/src/main/java/knightminer/inspirations/recipes/InspirationsRecipes.java b/src/main/java/knightminer/inspirations/recipes/InspirationsRecipes.java index 999c5c81..6fad1377 100644 --- a/src/main/java/knightminer/inspirations/recipes/InspirationsRecipes.java +++ b/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 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); } } diff --git a/src/main/java/knightminer/inspirations/recipes/RecipesClientEvents.java b/src/main/java/knightminer/inspirations/recipes/RecipesClientEvents.java index 95cc8290..cb28f098 100644 --- a/src/main/java/knightminer/inspirations/recipes/RecipesClientEvents.java +++ b/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); - } - } } diff --git a/src/main/resources/assets/inspirations/blockstates/beetroot_soup_fluid.json b/src/main/resources/assets/inspirations/blockstates/beetroot_soup_fluid.json index d030ea1d..8e6632e6 100644 --- a/src/main/resources/assets/inspirations/blockstates/beetroot_soup_fluid.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/inspirations/blockstates/honey_fluid.json b/src/main/resources/assets/inspirations/blockstates/honey_fluid.json index 9b1128a3..2016ed3e 100644 --- a/src/main/resources/assets/inspirations/blockstates/honey_fluid.json +++ b/src/main/resources/assets/inspirations/blockstates/honey_fluid.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "inspirations:block/fluid/transparent" + "model": "inspirations:block/fluid/honey" } } } \ No newline at end of file diff --git a/src/main/resources/assets/inspirations/blockstates/mushroom_stew_fluid.json b/src/main/resources/assets/inspirations/blockstates/mushroom_stew_fluid.json index d030ea1d..469e7c87 100644 --- a/src/main/resources/assets/inspirations/blockstates/mushroom_stew_fluid.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/inspirations/blockstates/potato_soup_fluid.json b/src/main/resources/assets/inspirations/blockstates/potato_soup_fluid.json index d030ea1d..54463282 100644 --- a/src/main/resources/assets/inspirations/blockstates/potato_soup_fluid.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/inspirations/blockstates/rabbit_stew_fluid.json b/src/main/resources/assets/inspirations/blockstates/rabbit_stew_fluid.json index d030ea1d..d3ac0ffc 100644 --- a/src/main/resources/assets/inspirations/blockstates/rabbit_stew_fluid.json +++ b/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" } } } \ No newline at end of file diff --git a/src/main/resources/assets/inspirations/models/block/fluid/beetroot_soup.json b/src/main/resources/assets/inspirations/models/block/fluid/beetroot_soup.json new file mode 100644 index 00000000..d31a1b58 --- /dev/null +++ b/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" +} + diff --git a/src/main/resources/assets/inspirations/models/block/fluid/colorless.json b/src/main/resources/assets/inspirations/models/block/fluid/colorless.json deleted file mode 100644 index b034075b..00000000 --- a/src/main/resources/assets/inspirations/models/block/fluid/colorless.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "textures": { - "particle": "inspirations:block/fluid/colorless" - } -} - diff --git a/src/main/resources/assets/inspirations/models/block/fluid/honey.json b/src/main/resources/assets/inspirations/models/block/fluid/honey.json new file mode 100644 index 00000000..d479ba6a --- /dev/null +++ b/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" +} + diff --git a/src/main/resources/assets/inspirations/models/block/fluid/mushroom_stew.json b/src/main/resources/assets/inspirations/models/block/fluid/mushroom_stew.json new file mode 100644 index 00000000..132cf0de --- /dev/null +++ b/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" +} + diff --git a/src/main/resources/assets/inspirations/models/block/fluid/potato_soup.json b/src/main/resources/assets/inspirations/models/block/fluid/potato_soup.json new file mode 100644 index 00000000..2758f523 --- /dev/null +++ b/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" +} + diff --git a/src/main/resources/assets/inspirations/models/block/fluid/rabbit_stew.json b/src/main/resources/assets/inspirations/models/block/fluid/rabbit_stew.json new file mode 100644 index 00000000..68d370dd --- /dev/null +++ b/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" +} + diff --git a/src/main/resources/assets/inspirations/models/block/fluid/transparent.json b/src/main/resources/assets/inspirations/models/block/fluid/transparent.json deleted file mode 100644 index 571525b1..00000000 --- a/src/main/resources/assets/inspirations/models/block/fluid/transparent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "textures": { - "particle": "inspirations:block/fluid/transparent" - } -} -