From 3a48ccdcb33fd424282a17aab5f32d83ef2787b4 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sun, 3 Mar 2024 19:01:42 +0100 Subject: [PATCH] Move the fluid textures so that Minecraft picks them up --- .../actuallyadditions/mod/fluids/FluidAA.java | 4 ++-- .../actuallyadditions/models/block/canola_oil.json | 2 +- .../models/block/crystallized_oil.json | 2 +- .../models/block/empowered_oil.json | 2 +- .../models/block/refined_canola_oil.json | 2 +- .../{ => block}/fluid/canola_oil_flowing.png | Bin .../{ => block}/fluid/canola_oil_flowing.png.mcmeta | 0 .../textures/{ => block}/fluid/canola_oil_still.png | Bin .../{ => block}/fluid/canola_oil_still.png.mcmeta | 0 .../{ => block}/fluid/crystallized_oil_flowing.png | Bin .../fluid/crystallized_oil_flowing.png.mcmeta | 0 .../{ => block}/fluid/crystallized_oil_still.png | Bin .../fluid/crystallized_oil_still.png.mcmeta | 0 .../{ => block}/fluid/empowered_oil_flowing.png | Bin .../fluid/empowered_oil_flowing.png.mcmeta | 0 .../{ => block}/fluid/empowered_oil_still.png | Bin .../fluid/empowered_oil_still.png.mcmeta | 0 .../fluid/refined_canola_oil_flowing.png | Bin .../fluid/refined_canola_oil_flowing.png.mcmeta | 0 .../{ => block}/fluid/refined_canola_oil_still.png | Bin .../fluid/refined_canola_oil_still.png.mcmeta | 0 21 files changed, 6 insertions(+), 6 deletions(-) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/canola_oil_flowing.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/canola_oil_flowing.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/canola_oil_still.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/canola_oil_still.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/crystallized_oil_flowing.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/crystallized_oil_flowing.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/crystallized_oil_still.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/crystallized_oil_still.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/empowered_oil_flowing.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/empowered_oil_flowing.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/empowered_oil_still.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/empowered_oil_still.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/refined_canola_oil_flowing.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/refined_canola_oil_flowing.png.mcmeta (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/refined_canola_oil_still.png (100%) rename src/main/resources/assets/actuallyadditions/textures/{ => block}/fluid/refined_canola_oil_still.png.mcmeta (100%) 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 d555eb03e..6665b48dd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/FluidAA.java @@ -56,8 +56,8 @@ public class FluidAA implements Supplier { public FluidAA(String fluidName, String textureName) { this.name = fluidName; - this.stillTexture = new ResourceLocation(ActuallyAdditions.MODID,textureName + "_still"); - this.flowingTexture = new ResourceLocation(ActuallyAdditions.MODID,textureName + "_flowing"); + this.stillTexture = new ResourceLocation(ActuallyAdditions.MODID, "block/" + textureName + "_still"); + this.flowingTexture = new ResourceLocation(ActuallyAdditions.MODID, "block/" + textureName + "_flowing"); this.fluidType = InitFluids.FLUID_TYPES.register(name, () -> new FluidType(createTypeProperties()) { @Override public void initializeClient(Consumer consumer) { diff --git a/src/main/resources/assets/actuallyadditions/models/block/canola_oil.json b/src/main/resources/assets/actuallyadditions/models/block/canola_oil.json index ea5c7b4a7..885aea492 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/canola_oil.json +++ b/src/main/resources/assets/actuallyadditions/models/block/canola_oil.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "actuallyadditions:fluid/canola_oil_still" + "particle": "actuallyadditions:block/fluid/canola_oil_still" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json b/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json index 414b5b762..7dbd3c5a1 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json +++ b/src/main/resources/assets/actuallyadditions/models/block/crystallized_oil.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "actuallyadditions:fluid/crystallized_oil_still" + "particle": "actuallyadditions:block/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 index cbf45e70b..a33ae00f4 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json +++ b/src/main/resources/assets/actuallyadditions/models/block/empowered_oil.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "actuallyadditions:fluid/empowered_oil_still" + "particle": "actuallyadditions:block/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 index d91f04912..532b83c0c 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json +++ b/src/main/resources/assets/actuallyadditions/models/block/refined_canola_oil.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "actuallyadditions:fluid/refined_canola_oil_still" + "particle": "actuallyadditions:block/fluid/refined_canola_oil_still" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_flowing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_flowing.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_flowing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_flowing.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_still.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_still.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_still.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/canola_oil_still.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/canola_oil_still.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_flowing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_flowing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_flowing.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_still.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_still.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/crystallized_oil_still.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/crystallized_oil_still.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_flowing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_flowing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_flowing.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_still.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_still.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/empowered_oil_still.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/empowered_oil_still.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_flowing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_flowing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_flowing.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_still.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_still.png diff --git a/src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/fluid/refined_canola_oil_still.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/fluid/refined_canola_oil_still.png.mcmeta