From ebb9200957d23657971340ca5663451859560780 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 5 Jan 2022 11:31:40 -0600 Subject: [PATCH] Fluids... how do they even work... --- src/generated/resources/.cache/cache | 3 +++ .../models/item/canola_oil_bucket.json | 5 +++++ .../models/item/crystallized_oil_bucket.json | 5 +++++ .../models/item/empowered_oil_bucket.json | 5 +++++ .../item/refined_canola_oil_bucket.json | 5 +++++ .../recipes/solid_fuel/charcoal-block.json | 8 ++++++++ .../recipes/solid_fuel/coal-block.json | 8 ++++++++ .../recipes/solid_fuel/lava.json | 8 ++++++++ .../recipes/solid_fuel/stick.json | 8 ++++++++ .../recipes/solid_fuel/tiny-coal.json | 8 ++++++++ .../data/ItemModelGenerator.java | 13 +++++++++++-- .../mod/ActuallyAdditionsClient.java | 15 +++++++++++++++ .../actuallyadditions/mod/fluids/FluidAA.java | 4 ++-- .../mod/fluids/InitFluids.java | 8 ++++---- .../mod/tile/TileEntityPoweredFurnace.java | 2 +- .../blockstates/crystallized_oil.json | 7 +++++++ .../blockstates/empowered_oil.json | 7 +++++++ .../blockstates/refined_canola_oil.json | 7 +++++++ .../assets/actuallyadditions/lang/en_us.json | 18 ++++++++++-------- .../models/block/crystallized_oil.json | 5 +++++ .../models/block/empowered_oil.json | 5 +++++ .../models/block/refined_canola_oil.json | 5 +++++ .../fluid/crystallized_oil_flowing.png | Bin 0 -> 12080 bytes .../fluid/crystallized_oil_flowing.png.mcmeta | 3 +++ .../textures/fluid/crystallized_oil_still.png | Bin 0 -> 9777 bytes .../fluid/crystallized_oil_still.png.mcmeta | 5 +++++ .../textures/fluid/empowered_oil_flowing.png | Bin 0 -> 11082 bytes .../fluid/empowered_oil_flowing.png.mcmeta | 3 +++ .../textures/fluid/empowered_oil_still.png | Bin 0 -> 11023 bytes .../fluid/empowered_oil_still.png.mcmeta | 5 +++++ .../fluid/refined_canola_oil_flowing.png | Bin 0 -> 9946 bytes .../refined_canola_oil_flowing.png.mcmeta | 3 +++ .../fluid/refined_canola_oil_still.png | Bin 0 -> 9022 bytes .../fluid/refined_canola_oil_still.png.mcmeta | 5 +++++ 34 files changed, 166 insertions(+), 17 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal-block.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal-block.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/solid_fuel/lava.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/solid_fuel/stick.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/solid_fuel/tiny-coal.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/crystallized_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/empowered_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/refined_canola_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f3fa0fbb2..1723d2497 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -269,6 +269,7 @@ bbf723238f6536295339f0b0b5b052cf89b92d5b assets/actuallyadditions/models/item/co 1e7e61701473dbf3dfc18bb5b9fa7be91b443dd8 assets/actuallyadditions/models/item/crusher.json aeacd7ca465c19d6cbcef25e61023397c4472ab3 assets/actuallyadditions/models/item/crusher_double.json 3a9cfcb0a3bec43f6556b3bdab09731758a36cc2 assets/actuallyadditions/models/item/crystallized_canola_seed.json +326668d58f3ba7ba650f0ebb604c6994356972a8 assets/actuallyadditions/models/item/crystallized_oil_bucket.json ec0cdeb022c4e0bc43c0fd5d3e3e758361f7ebe2 assets/actuallyadditions/models/item/diamatine_aiot.json 9e7e70f1efd1fdc83d78d0526657c229acf7293d assets/actuallyadditions/models/item/diamatine_axe.json 04cc1e040d286dbf4e8b828b52a76829ed51e14a assets/actuallyadditions/models/item/diamatine_boots.json @@ -335,6 +336,7 @@ d7948c3ad4bf22f0efa6e669de7a559c27b52aae assets/actuallyadditions/models/item/em cfabdb67ce0ccaaea437cfbbac68f0e0c8e7d890 assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json 3a339996daf88347e2abf829eb9f7d0e1915ed32 assets/actuallyadditions/models/item/empowered_enori_crystal.json 42bfc556aa4e9f0861855b4eee58397b75bd85f8 assets/actuallyadditions/models/item/empowered_enori_crystal_block.json +31ecbb82c3d2fb06d1da4dcbd229a689e0b6f251 assets/actuallyadditions/models/item/empowered_oil_bucket.json 0670cc4d0a2ab1561ea68603a078cf50f5cf2431 assets/actuallyadditions/models/item/empowered_palis_crystal.json d019c764e87de9f1856dc8d12b880d874e215fac assets/actuallyadditions/models/item/empowered_palis_crystal_block.json 7155b098b6f6bf5fe03f6546dd00217d8fa02721 assets/actuallyadditions/models/item/empowered_restonia_crystal.json @@ -471,6 +473,7 @@ af0512cfb813e6fb43bb920db3eb1f1c2976ace6 assets/actuallyadditions/models/item/qu bb0fbcacce026c672b8d98db22694fd2b6eefb20 assets/actuallyadditions/models/item/quartz_sword.json 7f7a44a1afcbfbe63bc55be016a81dc265515b24 assets/actuallyadditions/models/item/quintuple_battery.json d8cf56e92afa1ea98eead8af208cc6281c815ede assets/actuallyadditions/models/item/ranged_collector.json +fb9960a7f3f2488166e8e82ea664fdf08e3a9456 assets/actuallyadditions/models/item/refined_canola_oil_bucket.json a607d6e415c04d4aa4128446c3dbb40b9aafc5d5 assets/actuallyadditions/models/item/resonant_rice.json 68d8873d46bfbe65112f29bc4b1159e586d6705f assets/actuallyadditions/models/item/restonia_aiot.json 5300d3a0ece8b26a0bc0631df9151bebaef8a1b9 assets/actuallyadditions/models/item/restonia_axe.json diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json new file mode 100644 index 000000000..be298399d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/canola_oil_bucket.json @@ -0,0 +1,5 @@ +{ + "parent": "forge:item/bucket", + "loader": "forge:bucket", + "fluid": "actuallyadditions:canola_oil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json new file mode 100644 index 000000000..c38723ad5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystallized_oil_bucket.json @@ -0,0 +1,5 @@ +{ + "parent": "forge:item/bucket", + "loader": "forge:bucket", + "fluid": "actuallyadditions:crystallized_oil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json new file mode 100644 index 000000000..28f2b65e1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_oil_bucket.json @@ -0,0 +1,5 @@ +{ + "parent": "forge:item/bucket", + "loader": "forge:bucket", + "fluid": "actuallyadditions:empowered_oil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json b/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json new file mode 100644 index 000000000..ad240464a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/refined_canola_oil_bucket.json @@ -0,0 +1,5 @@ +{ + "parent": "forge:item/bucket", + "loader": "forge:bucket", + "fluid": "actuallyadditions:refined_canola_oil" +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal-block.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal-block.json new file mode 100644 index 000000000..11b56613d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal-block.json @@ -0,0 +1,8 @@ +{ + "type": "actuallyadditions:solid_fuel", + "item": { + "item": "actuallyadditions:charcoal_block" + }, + "total_energy": 480000, + "burn_time": 16000 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal-block.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal-block.json new file mode 100644 index 000000000..b7b2c20ee --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal-block.json @@ -0,0 +1,8 @@ +{ + "type": "actuallyadditions:solid_fuel", + "item": { + "item": "minecraft:coal_block" + }, + "total_energy": 480000, + "burn_time": 16000 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/lava.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/lava.json new file mode 100644 index 000000000..6477657ae --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/lava.json @@ -0,0 +1,8 @@ +{ + "type": "actuallyadditions:solid_fuel", + "item": { + "item": "minecraft:lava_bucket" + }, + "total_energy": 600000, + "burn_time": 20000 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/stick.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/stick.json new file mode 100644 index 000000000..52194118f --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/stick.json @@ -0,0 +1,8 @@ +{ + "type": "actuallyadditions:solid_fuel", + "item": { + "item": "minecraft:stick" + }, + "total_energy": 3000, + "burn_time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/tiny-coal.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/tiny-coal.json new file mode 100644 index 000000000..77b0eb458 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/tiny-coal.json @@ -0,0 +1,8 @@ +{ + "type": "actuallyadditions:solid_fuel", + "item": { + "tag": "actuallyadditions:tiny_coals" + }, + "total_energy": 6000, + "burn_time": 200 +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java index 52c5c044d..cd730a65b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java @@ -2,11 +2,13 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.mod.fluids.FluidAA; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import net.minecraft.block.Block; import net.minecraft.block.WallBlock; import net.minecraft.data.DataGenerator; +import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ItemModelProvider; @@ -40,8 +42,15 @@ public class ItemModelGenerator extends ItemModelProvider { // Blocks ActuallyBlocks.BLOCKS.getEntries().stream().filter(b -> !b.get().getRegistryName().getPath().contains("oil")).forEach(this::registerBlockModel); - withExistingParent(InitFluids.CANOLA_OIL.getBucket().getRegistryName().getPath(), "forge:item/bucket") - .customLoader((builder, template) -> DynamicBucketModelBuilder.begin(builder, template).fluid(InitFluids.CANOLA_OIL.get())); + generateBucket(InitFluids.CANOLA_OIL); + generateBucket(InitFluids.REFINED_CANOLA_OIL); + generateBucket(InitFluids.CRYSTALIZED_OIL); + generateBucket(InitFluids.EMPOWERED_OIL); + } + + private void generateBucket(FluidAA fluidSupplier) { + withExistingParent(fluidSupplier.getBucket().getRegistryName().getPath(), "forge:item/bucket") + .customLoader((builder, template) -> DynamicBucketModelBuilder.begin(builder, template).fluid(fluidSupplier.get())); } private void registerBlockModel(RegistryObject block) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java index 2e514b553..8cb780d25 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java @@ -15,12 +15,15 @@ import de.ellpeck.actuallyadditions.mod.blocks.render.*; import de.ellpeck.actuallyadditions.mod.entity.InitEntities; import de.ellpeck.actuallyadditions.mod.entity.RenderWorm; import de.ellpeck.actuallyadditions.mod.event.ClientEvents; +import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.inventory.ActuallyContainers; import de.ellpeck.actuallyadditions.mod.inventory.gui.*; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.network.play.ClientPlayNetHandler; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.network.play.client.CPlayerDiggingPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; @@ -64,6 +67,18 @@ public class ActuallyAdditionsClient { setupSpecialRenders(); RenderWorm.fixItemStack();// todo: remove + setupRenderLayers(); + } + + private static void setupRenderLayers() { + RenderTypeLookup.setRenderLayer(InitFluids.CANOLA_OIL.get(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.CANOLA_OIL.getFlowing(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.REFINED_CANOLA_OIL.get(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.REFINED_CANOLA_OIL.getFlowing(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.CRYSTALIZED_OIL.get(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.CRYSTALIZED_OIL.getFlowing(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.EMPOWERED_OIL.get(), RenderType.translucent()); + RenderTypeLookup.setRenderLayer(InitFluids.EMPOWERED_OIL.getFlowing(), RenderType.translucent()); } private static void setupSpecialRenders() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java index 57e9954fa..93cb2ccc1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java @@ -42,7 +42,7 @@ public class FluidAA implements Supplier { public FluidAA(String fluidName, String textureName) { name = fluidName; - ForgeFlowingFluid.Properties props = makeProperties(textureName, fluidBlock, source, flowing, bucket); + ForgeFlowingFluid.Properties props = makeProperties(textureName, () -> fluidBlock.get(), () -> source.get(), () -> flowing.get(), () -> bucket.get()); source = InitFluids.FLUIDS.register(name, () -> new ForgeFlowingFluid.Source(props)); flowing = InitFluids.FLUIDS.register(name + "_flowing", () -> new ForgeFlowingFluid.Flowing(props)); fluidBlock = ActuallyBlocks.BLOCKS.register(name, () -> new FlowingFluidBlock(source, AbstractBlock.Properties.of(Material.WATER))); @@ -50,7 +50,7 @@ public class FluidAA implements Supplier { } public static ForgeFlowingFluid.Properties makeProperties(String texture, Supplier blockSupplier, Supplier stillSupplier, Supplier flowingSupplier, Supplier bucketSupplier) { - return new ForgeFlowingFluid.Properties(stillSupplier, flowingSupplier, FluidAttributes.builder(new ResourceLocation(ActuallyAdditions.MODID,texture), new ResourceLocation(ActuallyAdditions.MODID, texture))).bucket(bucketSupplier).block(blockSupplier); + return new ForgeFlowingFluid.Properties(stillSupplier, flowingSupplier, FluidAttributes.builder(new ResourceLocation(ActuallyAdditions.MODID,texture + "_still"), new ResourceLocation(ActuallyAdditions.MODID, texture + "_flowing"))).bucket(bucketSupplier).block(blockSupplier); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java index 5baa12abe..02681ecc7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java @@ -21,10 +21,10 @@ public final class InitFluids { public static final DeferredRegister FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, ActuallyAdditions.MODID); public static final DeferredRegister FLUID_BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ActuallyAdditions.MODID); - public static final FluidAA CANOLA_OIL = new FluidAA("canola_oil", "canola_oil"); - public static final FluidAA REFINED_CANOLA_OIL = new FluidAA("refined_canola_oil", "refined_canola_oil"); - public static final FluidAA CRYSTALIZED_OIL = new FluidAA("crystal_oil", "crystal_oil"); - public static final FluidAA EMPOWERED_OIL = new FluidAA("empowered_oil", "empowered_oil"); + public static final FluidAA CANOLA_OIL = new FluidAA("canola_oil", "fluid/canola_oil"); + public static final FluidAA REFINED_CANOLA_OIL = new FluidAA("refined_canola_oil", "fluid/refined_canola_oil"); + public static final FluidAA CRYSTALIZED_OIL = new FluidAA("crystallized_oil", "fluid/crystallized_oil"); + public static final FluidAA EMPOWERED_OIL = new FluidAA("empowered_oil", "fluid/empowered_oil"); public static void init(IEventBus bus) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPoweredFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPoweredFurnace.java index d67e89b38..ecada31cf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPoweredFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPoweredFurnace.java @@ -239,7 +239,7 @@ public class TileEntityPoweredFurnace extends TileEntityInventoryBase implements @Nonnull @Override public ITextComponent getDisplayName() { - return new TranslationTextComponent("container.actuallyadditions.furnaceDouble"); + return new TranslationTextComponent("container.actuallyadditions.powered_furnace"); } @Nullable diff --git a/src/main/resources/assets/actuallyadditions/blockstates/crystallized_oil.json b/src/main/resources/assets/actuallyadditions/blockstates/crystallized_oil.json new file mode 100644 index 000000000..9c88f8b88 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/crystallized_oil.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystallized_oil" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/empowered_oil.json b/src/main/resources/assets/actuallyadditions/blockstates/empowered_oil.json new file mode 100644 index 000000000..3d83f33e1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/empowered_oil.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/empowered_oil" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/refined_canola_oil.json b/src/main/resources/assets/actuallyadditions/blockstates/refined_canola_oil.json new file mode 100644 index 000000000..cd27501f7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/refined_canola_oil.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/refined_canola_oil" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 277666cae..ae685c8a2 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -15,10 +15,10 @@ "misc.actuallyadditions.power_name_long": "Crystal Flux", "misc.actuallyadditions.power_name_short": "CF", "_comment": "Fluids", - "fluid.actuallyadditions.refinedcanolaoil": "Refined Canola Oil", - "fluid.actuallyadditions.canolaoil": "Canola Oil", - "fluid.actuallyadditions.crystaloil": "Crystallized Oil", - "fluid.actuallyadditions.empoweredoil": "Empowered Oil", + "fluid.actuallyadditions.refined_canola_oil": "Refined Canola Oil", + "fluid.actuallyadditions.canola_oil": "Canola Oil", + "fluid.actuallyadditions.crystallized_oil": "Crystallized Oil", + "fluid.actuallyadditions.empowered_oil": "Empowered Oil", "_comment": "Entities", "entity.Villager.actuallyadditions.jammer": "Jam Guy", "entity.Villager.actuallyadditions.crystallizer": "Crystallizer", @@ -164,7 +164,7 @@ "block.actuallyadditions.fermenting_barrel": "Fermenting Barrel", "block.actuallyadditions.canola_oil": "Canola Oil", "block.actuallyadditions.refined_canola_oil": "Refined Canola Oil", - "block.actuallyadditions.crystal_oil": "Crystallized Oil", + "block.actuallyadditions.crystallized_oil": "Crystallized Oil", "block.actuallyadditions.empowered_oil": "Empowered Oil", "block.actuallyadditions.misc_enderpearl": "Block of Enderpearl", "block.actuallyadditions.oil_generator": "Oil Generator", @@ -276,8 +276,10 @@ "item.actuallyadditions.growth_ring": "Ring of Growth", "item.actuallyadditions.water_removal_ring": "Ring of Liquid Banning", "item.actuallyadditions.suction_ring": "Ring of Magnetizing", - "item.actuallyadditions.bucket_canola_oil": "Canola Oil Bucket", - "item.actuallyadditions.bucket_oil": "Oil Bucket", + "item.actuallyadditions.canola_oil_bucket": "Canola Oil Bucket", + "item.actuallyadditions.refined_canola_oil_bucket": "Refined Canola Oil Bucket", + "item.actuallyadditions.crystallized_oil_bucket": "Crystallized Oil Bucket", + "item.actuallyadditions.empowered_oil_bucket": "Empowered Oil Bucket", "item.actuallyadditions.wings_of_the_bats": "Wings Of The Bats", "item.actuallyadditions.misc_bat_wing": "Bat's Wing", "item.actuallyadditions.wooden_paxel": "Wooden AIOT", @@ -628,7 +630,7 @@ "container.actuallyadditions.inputterAdvanced": "Advanced ESD", "container.actuallyadditions.crusher": "Crusher", "container.actuallyadditions.double_crusher": "Double Crusher", - "container.actuallyadditions.furnaceDouble": "Powered Furnace", + "container.actuallyadditions.powered_furnace": "Powered Furnace", "container.actuallyadditions.feeder": "Feeder", "container.actuallyadditions.giantChest": "Small Storage Crate", "container.actuallyadditions.giantChest.desc": "'Small'", diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json b/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json new file mode 100644 index 000000000..414b5b762 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "actuallyadditions:fluid/crystallized_oil_still" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json b/src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json new file mode 100644 index 000000000..cbf45e70b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "actuallyadditions:fluid/empowered_oil_still" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json b/src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json new file mode 100644 index 000000000..d91f04912 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "actuallyadditions:fluid/refined_canola_oil_still" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png new file mode 100644 index 0000000000000000000000000000000000000000..05a2dbb15b6d0c28cdff25b4e91a3ed4f3128019 GIT binary patch literal 12080 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 TjQMszT+=2Yg6DTh&LW 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 M`o?-Mbtv@z1%r_fKL7v# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta new file mode 100644 index 000000000..4f0718ac9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png new file mode 100644 index 0000000000000000000000000000000000000000..03e4b20d36a25923ce1adc2dee0a95cc2918d2ed GIT binary patch literal 9777 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 LNkvXXu0mjfufcDw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta new file mode 100644 index 000000000..0645f48c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png new file mode 100644 index 0000000000000000000000000000000000000000..22a5fa4a0befdc3b5f17c7723e82455df061a1f0 GIT binary patch literal 11082 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 JPDHLkV1j`n0G9v& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta new file mode 100644 index 000000000..0645f48c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png new file mode 100644 index 0000000000000000000000000000000000000000..d40c0a2f296c228d02e8894c4cb75da5d13f318a GIT binary patch literal 9946 zcmZ{Kc{r5q|MqOmjBN&E35^*|V@Z(+HJF7^M3!h{M5$D^mLV}S*7U?g)-0o^MG>MB zj~KE(3YDdmu{D;;45o%G@2%(geZRl=J&yN}Iqo^G<36tSygujoIY0Lm*S+@gG8!@< z5J=w9!PX6U;y@r62q6vpW9A%sz1HCG;N}bhMQ#LIVnLvVRp2=R0=XeTU=?o=Xh#+Z zq!v7IP@4n1iwto%5Do&#Dz5#&F#*2UfkyRncHZaQgO8uP=ofYj6ykUC?71yxkDbGr zZZY0sb}ZiH7zjipIoeV@7(U+f(0kC#%oX(BmmhX zql$aS9FAvQF1ltklK0?i{bj-6$HX^>73NZH&mTK(o9~;m?#SD1b6>7@uY9jQFIX)LrRBLs$a| zv7*BsTED!hv3q5u+kNS#k+nGm?1eG~vt7Q8o7_W0cSurKEm|5DMg%sC-;iSm3xgm8 z->BoRvE7>r&!-XYPJa}W4%=IQ+BdEg$K|^VGVa%);6Qd!t%!hP_4bgb&KG9{r zx~(0{xlcI#hbzEck_bvMci-p|c6cQR#OPc~-B#W8i1`QfaS z1zrUnH%Epn?8jQxtHHM1f@(qHYm**0i%j_TFo=U(rc zrmJWWlgAB$Y~K0(+ck#-#u?kfCE1VTRF3g_SR|t0b}|i(nzvlY=et1r*ULj(LWXt< z7QV`Y4}I&7SxOA#yX&U%htRjSB|7t$-cdnnEwK9?9swjqQYv_?C*KRE@OkL+delTL z`SwfCq@k6!tC9xyIyvwD$|g4g(fE;rQ_nIJAIp#N*J>+X!8Oz*`K ziZFH6vLy>UA$$nSMYG$w!%xwZf+=picqW>{nImD#VA!9F+QZrd(1vy&g$_45^Y=!h z#ALy~ogc!x=JcbdS*dQQr7D4ya)X$6k&3GONh%zv#wKC;(^a}0oAhj6vrcF+t!qb$ zuEA4VdP0np^fNs-L*m30;t7gKBAcLJFJ^+(U>+wCST)QqDXD^QY8cv*D&dz@iz?v| zr%s8&jvw3Yr>~@(?M)y~MDsY53SU=OC@o4h4YCCmhhQ(Wb)+yQCmB_~uEyPS?vn*E zy1=v^!k=Q_MdI`=egutwQw3u=d%m1=e{_Z4a8IHOyRv9^6jeI}dzk@ukx9EJI+!q( z#7*kk#A2T3enMk3s&P5P`4GVuFv}3bS*l-lDk5D;jkv$Eu3pYU`bo<4HoOUIcF*|n zuLSzKBdSA37_cj)?hF&X5EUgmor<}4sL7G3ANMP0Q7QfhE}g5)=+8iJjDc6URE^GI zd?R_VoZbNR(pT-<0)rTzhTOLwPkafIdMVr?kDpLr86i|D>-aQif@FeK8$l*t-$x!Z zj(EA_EaY;*h(CEY%#r&=_@nal-B?#Y88lJzuNLC4MK zUd%6JDJD&YY*^>f%gP=pcAQst`ztiONZwK%`H~4R^=-x_JKp}AS_XmME+wI|X?P#$ z5dRP|3UT|?mef!F1zAJrLPRNd%y>X2QdVoAkQ zwb+;sySd#!jA*}b;9D9~$Nvg=%hl8f^dqFaXe(cfgzPn})~bzVt`J$|n>})=xYrl% zI}SQ+LFP5YaGos=Wd2OVIt=Oz76p>-2dzi?7}q9@2jg}z->-eD3SWtbqzONhJMJr~b3_z|JdxbGaA zaky<#-bzTVi}Ab!!qJZ^Wa@Z#%@K=h{w|8?KlJnBurllI6k76NKdkG>BFgwxi&=B< z8btb`+HR=2DzJ3qh!llb)hzc^Jo(p-?t4JEy_hek9U!H53(I++cz@Zn0i44RSs5PK z3ir-P@7;9JX=Gt}+=Zkec7SZ!%oE&||GN(*jCoR{q)u*+4Sm&V9O6Ye!YQ&3o4-LN|iJ1!SI? zro7wfxKzRh5AU|yd)S_@>7mps0yNGcLE_E{xTnO@NblY4+D=P!!()u?=3P0TuGmN+ z2R1gXTkeej!MqA8MCew0y}Si{FC+p4wrh^_vu#Rm?swgWNy-{bj5E-BS z2)_~vJ!b~~Yd>^9`yqUBn6@;u8xzxD#Jw59{a@qNJ|K-e1HK<2=4?21u;wzq?v0h}fQ; zf%8gQr#Vu%9k(D$-}sJwTid$1uq{;Pn3X)xX<)v<9k^M8$mc$I?lxGN8!(bg=5<8g zo_JT-58U8El$^+Xp7(pqpKCb%pKW;N>uS2Nn`z#)EN27_IEHv5FO{*Mj zO^~$7_w>QO9+dY+KE+NXqD0z0C<)I(H^~;ZMaMJra@A|^rproNSSQg|rY7--qPo-f zT-@^4$()bUazYjG_!Y;^dLLrb>*_YKNiP#SG2JssD--@^=`d9aF`1X>kUyl$3cq@9 zc5Ls`jOL8CNd{MF-meoP$z>+0A1+`72l~jV4==2LJwtkgToIi!@;FP9}j zlrRea%wsDSZjTJ)(j^+FPCaI`1Hd7+IBzLCGXz#9O>J~}=0>C=$O1`a2YSEigT1`d zfJpnOSRdVM&{LCT?>aG8bDd#$+jLRb^{Y{?`(*LRqrP=x;b(HXj;IZMp!N)26PB`x zdTB)0jFF%WwDAxz3=5+(gmU5bEnUV|NpF7QD&|H2Or$p_)S5jgNt|4b!(xL!Bh za!ErIkV}%mDHaqEP@8(721(V0`nvjZ$w|)-cf#1EqcV4{O1lh&WmKQnN)@UStU@TR zno|BEG(^0${K2~x^JaU_yOB+h?<%`;t&o&Vj2B{dAZnN7P$YkkQ4X39CX9VA9;vmy z3-^gzyFe^dIo$dgxXgp-s!mj-Xy5BbW849~b%=ACa@2~fK29;HqUk9)_wKmcqqRG} zr{(xewi@)fWSM;wV9T{I39w}xRw7RR-P=FSYyIwSRH0PQfzO04cIfYsn@Nx?vDwJa z8curYqotxz${#BDL3z=RlqWazFvR%Vh;!mv730w?*!)#`axk=#a#$JEbaf7FXV_h1 zBmYcO8=6-Lhgt5rxpcTwhhATHh6gf&M$hU7-$yT{HEeK8$F<|xTwM3(@^QNctj?`X zb*K2p7?a?YMx6*nh;x!y<7LEI9pAok%TJ>R5RbdNh1Ua~Vj$<=AacS4S1PShXbM#g z@`{FZ7JY!5vQoMfFImDs+Dfh+Iu*AoZ{>^_Ng>Gy(@7Q=SI1xm9v1Nraz3#HhV6}< zihP)%cIMUA6s_9Sh^c{PC?yQO;>J15;0470aWoRAH%~^CNp-9Tf^jJLR_%RQ`I^9IEd^z@dGB;#H$gBqq-a*NxrNIK-2X0!KoCW|-tN~qt2 z4yZt$=qi%k#l@s(VvD}fwm1FeyXuGV!J1VmNsyIrWG)Ig2!LO~iTl#~HFpD8gwxC&S0U>0D8VGO4}t4e8os0eY{>bI5+Ctnw#sRq%dMNvq;LLhX3mLN#*bPi2BpYcQo! z3Q%Z|eoHs)J6ML|e|1=$V$GkM`e0ojqbcC6Y#nR@Eq|aPsi7PiI_c z(tuyHMql%fFE~A_#^^Gaku?;n_&0v#nz^#{5dv`s@)^oe<)b4#71OW3;{4QIK9~26 zZ~~RrrlT7dS8yrJve_SmW%yelYKtEi-h4-}x|_+aR0C91&-L85r|_WWu=_?>@2Hex zvfCAUO z5_8|Ezsq`uL{5D1oT3zYBtvy{1R zWjALccjIlX2W~kC9KIFW{q52Wn6{+j0D1^pG^_wKMn*>PsyE|E`syQlP$zl_DpY0q z!`z3N=FZ$qj@MRskqbfz@n97=t;LkOijjOEDE%vqpJEv*kvPG&SdVE6FIt|}8a{C& z@Y5X6gq~z01_fo7AfqK+{8)b5Y9QXCJ6!JBHLq+V;eD2-#9qvNezXRJ%Q|v+Y2V9x z3N?ta_vqDPtgvvp=W9`t0(&g0d;C3O)!K^lt&048?o(Gec5hOm#EZ^zb#)RQ;*f|A zD+{>WTL)3e7ZbS**wA?)AzC(Vv%`Lhn~j6#i-Y4&vXafOWiZU>vS~mhN{aE|NUC_! z{3}VSc^Fa|2l2V%vw&!C#3+*cmQ-3|I8ne&Vy6NjbUm=>UaP5 zq_rmjmFI0${K>6`(VFM`#^v>J%_35SUiF4~n>>jL(n;SY@FHf8cWuBbi0;5mCc23| zX-K?(?GJ(BMryY46mZCLI2$y5>$FPR$}vMMIV^Ho=AxgO2$V|L6K!%oOo~!^1fi}B zUiN(Nb9`G}_0j7AN_M@l!=j#LIN1Mtn=IlkWBo4cz5Yioy@k!6kHIQIex5uj`WBcJ zlOE$fftzs5!uHIBPz@lZ_dr|eNm<}kNg=#($CV(&TkT436zj@XdO|g!D7D$_5TDW^VipS4Q&w;;}EUJ;My44lr)y|UTXnd^KkX~2MU%a3a4a{b-nqEZLV ziC-~=*WqIV%BYqtdpI{jERd=cFstb+9K%W$pw;vrQ&dh{(s!Wt+{;OI_9|Zl#p9M0@ZrxCL^FL*@4{0*ObpmEC!5~)#h9-= z#nL+he!cYC;{4q**v7@-`43>bZQeqod2#?d{*w|K_d!>8G&g8ixz=&aurj20*ZNPmgKf`OV zJ_FJ|B|PY=&e)=>;;np@+2hYcH~6}qrpyjt2n{~M8SIOgbL_E_tdVNmdm}v{ad>+4 z;cK5=1{%tFns$i1Q5_4Z`0};>`RMtRU;N+pl~|MU4l#v-`rjeT2_*q<15_Fiy-Fe| zq6Vwb{ARPbNz{STL|(JH@bg=xOu?O)*Wu= z4zr(_*t0dBJnXI*&x9+8rbDCbTz{Djid9R9ZtL&pgxv9(fHT&)_TS`&y@M6!#!0eA zwcKpy-vg_B1KNS7zlvNXHZvwHe|Y#TfM&nMw$YYyAi+3i?#8CTp&%_KWlHHSrEJ$z zc|9pY#XIlsm=C6)5)3A+t(lxFNs&(GLiAm&d z#XhXRnj*+QOI)%MGN!|5UpsG@X@4kjw}pk54x78!@wwIVb4j-*T5bS^8THBHfH!)sfR z2t5}ZwF^;@_`V2uARvD1#bh7CJ6iqzzQygpdoOv44-^VSr{h+ArddO=zeUoT7ez+pB}(-dzz!0LJrYM|+mGB!|74})z$e%? zeVn3%ba5wO{jh+r9id^3V+_hlcdzGbs}P9XNKuau7Iu}(1CI15&hHhq6f<$h0vdYU+6VAMd<2I$dVgrA<01sc>-#o^cv+w(qQwu{M;kktS)>1A zIr(EGw7lbK&a&{6>n1Ne6 zXtUMm-s+)WqRSeCM6zof-`j_o`b`Zmxg07#!eoLYdZypQ^2Sv$Dl6-v6$u71(FrJU z(9^4Jcx!Fyu?+^#Z*Gmg;v!!M8ZzU}Ha6)nowzUlO6Pf=rVI-Uq!_v@9=2xQus9KH z`@Xu+^V(9|o86($ZEt9w(TaOR_#V4NaM;5dMlMDt`HIOY9YlVllCcjAS>Cd7L2KmC zq@#G)4&qI^h}ZH|>2`OG)`%iuwH#qlSdOH=fq8~3yV}!}>^a;MR9y;N ze~ZX+*~1$glF6B;0ynY0Z(~_GOx$n@0)76-#9Om(>xRFIRGnc*u!LY| z9EbJ}b&?H_1k6(>6v1nKlNhB1`>~^JuC5|=IA#^Ivel{wW*K6l3$xjI!G=_V_>|hv z5A7)G4o^HQ|45taQ+N+vkoX@U0tC2ogM;Lf1D*~AK(iM}J*mTm!$TV!7QviC)V^aj z?i>=T;U6>Y^gmi{-@PI$hrwL_1|W(N{yQFE*LuEOM`nnQCjF=TXQoWo^(v+H^MRMO zZ|m@;(MzGp-6l@Oy&%y37YEnhx8wBWlJDiw5a7Q)$Z1o;&^@XUsuxZ!4p%fM29c{-qxcf}Whq|-L$SynIk#Fr(Sryu%`Gwp{J3^0p)(V&Gp){!_#B!+` zw+hmK#r>>Ke5S=8QupwjI`RcAo5Cfz=3g$Te zW_k|i;4Pn=2pJ$Q`AB)3y+zgY`B<#aNzU557H?Pqq90mC|n+ ze`B?C@AT*JUYq8D16;>y1a=vkI7c!+&a@GeV{+n{-DBk{uNIhXVqU)FVC6;6_k7qJj;Ki%q}B&^p;N(+wkww*5Jgr85U>Q}L4RJj zaEO#(pJr(a2N#7hK-(J^K#CKF<%!|#a-yxgVP!qobVL`lvM!g&J~e~Kj(Aa&Tol+) z1_c*#j%lU$^~};=0=|*FFl;M0;FKM+#knUT-^{qlh;6$w{pShAb9l3b-93bdj{Wy*GI^$%FOdF+H$mpPPhLw(0jTDhU6h5J-}a)g-}np zs6tryKYqR+g#*xG=U)}xmt3gqjaBI>YSiM4VE+a#18TE z?{AoLjSxU*^?TMS;hunm8!!*d1vQA`v2{Mu#Ub9E(z0V$?C5S(PZ%Zx+ZqhX4~ihQ z*mD@S4%Q#{Rho#T@MirchxOm#3-XQWP5vRu69wo~UyDa(Tlb(){fRayt5cUHc~ai3 z=Qo1#?#lm}+&-98YPEY6p-oYmHbQ>bhR8fN*6s29(Dd>zQ3)7)N!}NoeY=guzZDx` z#@_;H>tvAe!hN=-gUJ@ud=DovAgK++I|T`qigFBDvAr3(C^4TPwR(PAme`IcE}deY ztKH!o0C^JG9+8`mGTnC#C9KmW*q|p!KSTd+);S4j+7G*`>oY`K(kvX#*f4X-nSMmD z623vSYgDAeFZ`K1yk<^Kvx5KK_pm3CX^p1hiziaG5?=bH!oMEh5H(LWY#=Z#t_>Iq zWTiLjUqA7Dx&W|CheJQXp4K6XzsK|9L|Eu9$wz547NNJrL2`Js^ho-Tcj%ZY*5Gr{ zP4Z=@Q!Z4X-gw*2`h|@>suasucWs`h0zerkHvL9Y16N%pS$~CwOp6JsdpZK~Ej;l_ znR;!#=ix!diF>Ie5$Yn`;2g+8|R&Q-R6)}&%w!0sWEyE zbqPiYr#GYckk^z-jS#gJ48a+cy)+i=aJv@YA&FI!n`!)uU(nQWnA213>xy9w{6zno zdPD__c`N{oXB)J+?`L(mwQ3OM)=L221Z$ERIPNptaQL;V3(g<>X-oIvkv}1)0f+9s z6|xcN(|xH^%%pwrKinq`L`GF;WTzn{>{O?UHNr$dz@^TkL`npRXG)!|0_2FkdITEq z^NckLN5WMD*4b5=gRea~1t}EB6Cdjv0-4*Krqb+f1tUd6UtMaHqwr=Pv$hS89Bq#t z?%NkfZkwd=m--{H5bW5|ZIqNzuywAnZf=vf!%M`i!^PEN*=*N2+#Z8g@q$vhvgnwk z7c?ZQ+vzt>;Z`K@8lrJ*hgqkx$pX)Fmzlh?D zJPIrOHG4YF2%4fAlF}dN`f>6=3;ITN*Z8CQnbs^^jgG|w@AOAcOV&-=dEaD?n>PzA zx*VT8*5MmFvd%~2tq`VPo=3A?6braALzJG`lX%zBQ!YRNX=5I=hHPahG4dmI3P1;M zB0uc{cG)`8N|+&NfUhc93Ck8MvuJuKUuG)U>wmdseG}jVEfiu%A-v-QD9E6+Wq^JT_g7zI;gwm=KMG1m!_UU>~%KJ@{x1}6sFFG^5#!dqc z!~=EqY<~@@|L13k0GS3j^?ENqONwy<3wQ(VMW;1UEMLM^S_0amnTUeFu3?V(>k z)mRZ6vNt8-g|Ri==i_1)E&4A+?%xWVijB+5st8%lmk1`oWGiXoB2RabyohFn8^N!9 z?1x^g<66kvmh-l*ipp!q;A&oejK@NEq*@KLd05VL++rGY8Xa?zdG&$S^|SWfe{pWK zN#8w5S~L4`nH267JMOh6O$RJBJ6MsC;|zE_vE(>4tj9`aifr+w%QeT{*YP)WR1%cj zp0?|RIN-YzHbBIa^*=5sI|HR9B6eC#b!~PNr~-|Y)?Nu_X4IljhDBVDHO|Rf)PP)i zaq>9oZ{|8I^qe=Dykc6^Sl|j93)@Jy)=aVK76$i(Dj=oKJM+z=yuaqP1iiYLQS}t! zSEG#^rD)$Lx}Rti^(vVEPw8=uvxFM+%$+4nne5DwD~b5xSEEAE2)=$VOU&eHcZ=8oZvh15*k$?O?F#qVnPaT zGUBwSz+t2p4G?H{1+%}~ex?0D>t2Xp-?K$wx>fxC z%NlQE(}ER&L=Y%0{C2>eVkO(fyd(c$$VhL>G=Tmn3Qt#xzc4T28kVRVHxIpmYTcB{ z%B7xQpC;h-j2L{OR6GD2`iNrm0+@SSw7k{X4KYjNOVwYkN~;RNkc4CQ5~n%$EnyeX9^n~_4XpGm*~Z#WW6PKZ^`7)C$dNl_u#Zx)Gf-x(Na~8^ z?@1MFxRh1>u@_==XLLm&YVV6$k!Pk6OyA^bZ`>o~)V2)Li#F!h(E(T)5Du?R)_3&Y zl~~JfFi?OvkL_N`j{0K!E22E+nzP6!L8l!Ec(C|VWeVvp0v+2-^go@@28uqqAc)5m z#W8zC@0+TSy#ql*!}-JET63Gt)0M528Pr9@y1_Rt+Au?_G8#$x#5TX@nem$_Q~`A3 z<=S9KgnD-%qfn~DPcfiy3&a`2Pv-gQ4y^oaNnjKv9N6N-4cQCvs-6{WikqjAV|lCf z@8k;KR>&gQ1t%c+$J3mndGCk5d9A%Ku}=9MnogFwps%M2X}FaG)Fi=W*40(%o-C`< z5HrDrq{2yX|9^<)_h%14DM;p(e+-{L)fG|jD#3V`yw|)u+>V~qebT{Ou8#ODw1DQe zaA6`*;)(i1*$l3C+RMFQY{NdH`#AK^?@3+Y^=Q f>$)`NvZ@U$`hZcs+-(AUYX)+(+iP1!rL+GJ#S=$e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta new file mode 100644 index 000000000..4f0718ac9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png new file mode 100644 index 0000000000000000000000000000000000000000..b00fa0ae40b112d9257fb3b6a391439efd271dff GIT binary patch literal 9022 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta new file mode 100644 index 000000000..0645f48c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +}