From 2252bb094e01c98c889bde6b47219768d73c08f2 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Wed, 12 Jul 2017 14:19:48 -0400 Subject: [PATCH] Closes #813 (#844) * update oil fluid name * resolve some npe --- .gitignore | 3 ++- .../mod/ClientRegistryHandler.java | 2 +- .../actuallyadditions/mod/booklet/InitBooklet.java | 2 +- .../mod/crafting/InitCrafting.java | 2 +- .../actuallyadditions/mod/creative/CreativeTab.java | 2 +- .../actuallyadditions/mod/fluids/InitFluids.java | 8 ++++---- .../actuallyadditions/mod/items/ItemMisc.java | 2 +- .../mod/network/PacketHandler.java | 2 +- .../mod/tile/TileEntityFermentingBarrel.java | 4 ++-- .../actuallyadditions/blockstates/fluids.json | 4 ++-- .../assets/actuallyadditions/lang/de_DE.lang | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 6 +++--- .../assets/actuallyadditions/lang/fr_CA.lang | 4 ++-- .../assets/actuallyadditions/lang/fr_FR.lang | 4 ++-- .../assets/actuallyadditions/lang/zh_CN.lang | 2 +- ...ing.png => block_refined_canola_oil_flowing.png} | Bin ... => block_refined_canola_oil_flowing.png.mcmeta} | 0 ...still.png => block_refined_canola_oil_still.png} | Bin ...ta => block_refined_canola_oil_still.png.mcmeta} | 0 19 files changed, 25 insertions(+), 24 deletions(-) rename src/main/resources/assets/actuallyadditions/textures/blocks/{block_oil_flowing.png => block_refined_canola_oil_flowing.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{block_oil_flowing.png.mcmeta => block_refined_canola_oil_flowing.png.mcmeta} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{block_oil_still.png => block_refined_canola_oil_still.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/blocks/{block_oil_still.png.mcmeta => block_refined_canola_oil_still.png.mcmeta} (100%) diff --git a/.gitignore b/.gitignore index e523feb61..f150b06b5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ *.project .settings/org.eclipse.buildship.core.prefs *.launch -.settings/org.eclipse.jdt.core.prefs \ No newline at end of file +.settings/org.eclipse.jdt.core.prefs +*.prefs \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java index 6613fe364..89e32b777 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ClientRegistryHandler.java @@ -44,7 +44,7 @@ public class ClientRegistryHandler{ } registerCustomFluidBlockRenderer(InitFluids.fluidCanolaOil); - registerCustomFluidBlockRenderer(InitFluids.fluidOil); + registerCustomFluidBlockRenderer(InitFluids.fluidRefinedCanolaOil); registerCustomFluidBlockRenderer(InitFluids.fluidCrystalOil); registerCustomFluidBlockRenderer(InitFluids.fluidEmpoweredOil); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 652b6a839..c9c9dfebf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -237,7 +237,7 @@ public final class InitBooklet{ //RF Generating Blocks new BookletChapter("solarPanel", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("", TileEntityFurnaceSolar.PRODUCE), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText()); new BookletChapter("heatCollector", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("", TileEntityHeatCollector.ENERGY_PRODUCE).addTextReplacement("", TileEntityHeatCollector.BLOCKS_NEEDED), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText()); - new BookletChapter("canola", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).addItemsToPage(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addItemsToPage(new ItemStack(InitItems.itemCanolaSeed)).addFluidToPage(InitFluids.fluidCanolaOil), new PageTextOnly(2).addFluidToPage(InitFluids.fluidOil).addFluidToPage(InitFluids.fluidCrystalOil).addFluidToPage(InitFluids.fluidEmpoweredOil), new PageCrafting(3, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(4, BlockCrafting.recipeFermentingBarrel), new PageCrafting(5, BlockCrafting.recipeOilGen), new PageReconstructor(6, LensRecipeHandler.recipeCrystallizedCanolaSeed).setNoText(), new PageEmpowerer(7, EmpowererHandler.recipeEmpoweredCanolaSeed).setNoText()); + new BookletChapter("canola", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).addItemsToPage(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addItemsToPage(new ItemStack(InitItems.itemCanolaSeed)).addFluidToPage(InitFluids.fluidCanolaOil), new PageTextOnly(2).addFluidToPage(InitFluids.fluidRefinedCanolaOil).addFluidToPage(InitFluids.fluidCrystalOil).addFluidToPage(InitFluids.fluidEmpoweredOil), new PageCrafting(3, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(4, BlockCrafting.recipeFermentingBarrel), new PageCrafting(5, BlockCrafting.recipeOilGen), new PageReconstructor(6, LensRecipeHandler.recipeCrystallizedCanolaSeed).setNoText(), new PageEmpowerer(7, EmpowererHandler.recipeEmpoweredCanolaSeed).setNoText()); new BookletChapter("leafGen", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockLeafGenerator), new PageTextOnly(1).addTextReplacement("", TileEntityLeafGenerator.ENERGY_PRODUCED).addTextReplacement("", TileEntityLeafGenerator.RANGE), new PageCrafting(2, BlockCrafting.recipeLeafGen)).setImportant(); new BookletChapter("bioReactor", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockBioReactor), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBioReactor).setNoText()).setSpecial(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java index 0567a4535..519e44f1e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/InitCrafting.java @@ -40,7 +40,7 @@ public final class InitCrafting{ int[] power = ConfigIntListValues.OIL_POWER.getValue(); int[] time = ConfigIntListValues.OIL_TIME.getValue(); ActuallyAdditionsAPI.addOilGenRecipe(InitFluids.fluidCanolaOil.getName(), power[0], time[0]); - ActuallyAdditionsAPI.addOilGenRecipe(InitFluids.fluidOil.getName(), power[1], time[1]); + ActuallyAdditionsAPI.addOilGenRecipe(InitFluids.fluidRefinedCanolaOil.getName(), power[1], time[1]); ActuallyAdditionsAPI.addOilGenRecipe(InitFluids.fluidCrystalOil.getName(), power[2], time[2]); ActuallyAdditionsAPI.addOilGenRecipe(InitFluids.fluidEmpoweredOil.getName(), power[3], time[3]); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index e85e38c8d..50362e244 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -195,7 +195,7 @@ public class CreativeTab extends CreativeTabs{ UniversalBucket bucket = ForgeModContainer.getInstance().universalBucket; this.list.add(UniversalBucket.getFilledBucket(bucket, InitFluids.fluidCanolaOil)); - this.list.add(UniversalBucket.getFilledBucket(bucket, InitFluids.fluidOil)); + this.list.add(UniversalBucket.getFilledBucket(bucket, InitFluids.fluidRefinedCanolaOil)); this.list.add(UniversalBucket.getFilledBucket(bucket, InitFluids.fluidCrystalOil)); this.list.add(UniversalBucket.getFilledBucket(bucket, InitFluids.fluidEmpoweredOil)); 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 c015312cb..2465e4176 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/fluids/InitFluids.java @@ -22,23 +22,23 @@ import java.util.Locale; public final class InitFluids{ public static Fluid fluidCanolaOil; - public static Fluid fluidOil; + public static Fluid fluidRefinedCanolaOil; public static Fluid fluidCrystalOil; public static Fluid fluidEmpoweredOil; public static Block blockCanolaOil; - public static Block blockOil; + public static Block blockRefinedCanolaOil; public static Block blockCrystalOil; public static Block blockEmpoweredOil; public static void init(){ fluidCanolaOil = registerFluid("canolaoil", "block_canola_oil", EnumRarity.UNCOMMON); - fluidOil = registerFluid("oil", "block_oil", EnumRarity.UNCOMMON); + fluidRefinedCanolaOil = registerFluid("refinedcanolaoil", "block_refined_canola_oil", EnumRarity.UNCOMMON); fluidCrystalOil = registerFluid("crystaloil", "block_crystal_oil", EnumRarity.RARE); fluidEmpoweredOil = registerFluid("empoweredoil", "block_empowered_oil", EnumRarity.EPIC); blockCanolaOil = registerFluidBlock(fluidCanolaOil, Material.WATER, "block_canola_oil"); - blockOil = registerFluidBlock(fluidOil, Material.WATER, "block_oil"); + blockRefinedCanolaOil = registerFluidBlock(fluidRefinedCanolaOil, Material.WATER, "block_refined_canola_oil"); blockCrystalOil = registerFluidBlock(fluidCrystalOil, Material.WATER, "block_crystal_oil"); blockEmpoweredOil = registerFluidBlock(fluidEmpoweredOil, Material.WATER, "block_empowered_oil"); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index d48957633..819f6a1f6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -87,7 +87,7 @@ public class ItemMisc extends ItemBase{ if(block instanceof IFluidBlock && block.getMetaFromState(state) == 0){ Fluid fluid = ((IFluidBlock)block).getFluid(); - if(fluid != null && fluid == (isEmpowered ? InitFluids.fluidCrystalOil : InitFluids.fluidOil)){ + if(fluid != null && fluid == (isEmpowered ? InitFluids.fluidCrystalOil : InitFluids.fluidRefinedCanolaOil)){ entity.setDead(); entity.world.setBlockState(pos, (isEmpowered ? InitFluids.blockEmpoweredOil : InitFluids.blockCrystalOil).getDefaultState()); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java index 3c59873d2..f02310b62 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java @@ -182,7 +182,7 @@ public final class PacketHandler{ } } else{ - ModUtil.LOGGER.error("Tried to receive Player Data for player "+player.getName()+", but he doesn't seem to be present!"); + ModUtil.LOGGER.error("Tried to receive Player Data for UUID "+compound.getUniqueId("UUID")+", but he doesn't seem to be present!"); } } }; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index d2ae260d3..8e9c22033 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -54,7 +54,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari this.handlerMap = new FluidHandlerFluidMap(); this.handlerMap.addHandler(InitFluids.fluidCanolaOil, this.canolaTank); - this.handlerMap.addHandler(InitFluids.fluidOil, this.oilTank); + this.handlerMap.addHandler(InitFluids.fluidRefinedCanolaOil, this.oilTank); } @Override @@ -88,7 +88,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari if(this.currentProcessTime >= PROCESS_TIME){ this.currentProcessTime = 0; - this.oilTank.fillInternal(new FluidStack(InitFluids.fluidOil, produce), true); + this.oilTank.fillInternal(new FluidStack(InitFluids.fluidRefinedCanolaOil, produce), true); this.canolaTank.drainInternal(produce, true); } } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/fluids.json b/src/main/resources/assets/actuallyadditions/blockstates/fluids.json index ab66adc9d..47eb9e5e9 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/fluids.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/fluids.json @@ -5,9 +5,9 @@ "model": "forge:fluid", "custom": { "fluid": "canolaoil" } }, - "oil": { + "refinedcanolaoil": { "model": "forge:fluid", - "custom": { "fluid": "oil" } + "custom": { "fluid": "refinedcanolaoil" } }, "crystaloil": { "model": "forge:fluid", diff --git a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang index c8f469f96..48df75415 100644 --- a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang +++ b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang @@ -4,7 +4,7 @@ achievement.page.actuallyadditions=Actually Additions actuallyadditions.lolWutHowUDoDis.name=This is bugged. Throw it away. Please. #Fluids / Flüssigkeiten -fluid.actuallyadditions.oil=Öl +fluid.actuallyadditions.refinedcanolaoil=Öl fluid.actuallyadditions.canolaoil=Rapsöl #NEI Integration / NEI Integration diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index d4ada89b0..faacac858 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -4,7 +4,7 @@ achievement.page.actuallyadditions=Actually Additions actuallyadditions.lolWutHowUDoDis.name=This is bugged. Throw it away. Please. #Fluids -fluid.actuallyadditions.oil=Oil +fluid.actuallyadditions.refinedcanolaoil=Refined Canola Oil fluid.actuallyadditions.canolaoil=Canola Oil fluid.actuallyadditions.crystaloil=Crystallized Oil fluid.actuallyadditions.empoweredoil=Empowered Oil @@ -178,7 +178,7 @@ tile.actuallyadditions.block_treasure_chest.name=Treasure Chest tile.actuallyadditions.block_canola_press.name=Canola Press tile.actuallyadditions.block_fermenting_barrel.name=Fermenting Barrel tile.actuallyadditions.block_canola_oil.name=Canola Oil -tile.actuallyadditions.block_oil.name=Oil +tile.actuallyadditions.block_refined_canola_oil.name=Refined Canola Oil tile.actuallyadditions.block_crystal_oil.name=Crystallized Oil tile.actuallyadditions.block_empowered_oil.name=Empowered Oil tile.actuallyadditions.block_misc_enderpearl.name=Block of Enderpearl @@ -993,7 +993,7 @@ booklet.actuallyadditions.chapter.heatCollector.text.1=The Heat Collector< booklet.actuallyadditions.chapter.canola.name=Canola and Oil booklet.actuallyadditions.chapter.canola.text.1=Using Canola, you can make a simple, yet effective power generation system from natural resources. To do this, first find some Canola Plants in the wild and plant them on your farm. The Canola you get out of them can be used in a Canola Press to make Canola Oil. This can be used in an Oil Generator. It displays the amount of power it generates in its GUI, however, it can be upgraded further to yield more power than that! -booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a Fermenting Barrel to convert the Canola Oil into Oil. If you're still not satisfied with the power that generates, place the oil on the ground and throw in a Crystallized Canola Seed to make Crystallized Oil. If that isn't enough for you either, make an Empowered Canola Seed and toss that into some Crystallized Oil to get Empowered Oil! +booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a Fermenting Barrel to convert the Canola Oil into Refined Canola Oil. If you're still not satisfied with the power that generates, place the refined canola oil on the ground and throw in a Crystallized Canola Seed to make Crystallized Oil. If that isn't enough for you either, make an Empowered Canola Seed and toss that into some Crystallized Oil to get Empowered Oil! booklet.actuallyadditions.chapter.canola.text.4=The Fermenting Barrel can have a Comparator attached to it which will result in the Redstone strength being equivalent to the percentage of the output tank. booklet.actuallyadditions.chapter.canola.text.5=If you break the Oil Generator, it will keep the liquid inside. Place it in the crafting grid to empty it out. It will stop generating when powered by Redstone. Additionally, using a Comparator will yield the percentage of energy stored. diff --git a/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang b/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang index a681ed586..2ab3739ca 100644 --- a/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang +++ b/src/main/resources/assets/actuallyadditions/lang/fr_CA.lang @@ -4,7 +4,7 @@ achievement.page.actuallyadditions=Actually Additions actuallyadditions.lolWutHowUDoDis.name=C'est buggé... Jettez-le vite avant que ca explose! #Fluides -fluid.actuallyadditions.oil=Huile +fluid.actuallyadditions.refinedcanolaoil=Huile fluid.actuallyadditions.canolaoil=Huile de Colza fluid.actuallyadditions.crystaloil=Huile cristallisée fluid.actuallyadditions.empoweredoil=Huile Puissante @@ -178,7 +178,7 @@ tile.actuallyadditions.block_treasure_chest.name=Coffre au trésor tile.actuallyadditions.block_canola_press.name=Presse à colza tile.actuallyadditions.block_fermenting_barrel.name=Baril de fermentation tile.actuallyadditions.block_canola_oil.name=Huile de colza -tile.actuallyadditions.block_oil.name=Huile +tile.actuallyadditions.block_refined_canola_oil.name=Huile tile.actuallyadditions.block_crystal_oil.name=Huile cristallisée tile.actuallyadditions.block_empowered_oil.name=Huile puissante tile.actuallyadditions.block_misc_enderpearl.name=Block de perle de l'ender diff --git a/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang b/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang index a681ed586..2ab3739ca 100644 --- a/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang +++ b/src/main/resources/assets/actuallyadditions/lang/fr_FR.lang @@ -4,7 +4,7 @@ achievement.page.actuallyadditions=Actually Additions actuallyadditions.lolWutHowUDoDis.name=C'est buggé... Jettez-le vite avant que ca explose! #Fluides -fluid.actuallyadditions.oil=Huile +fluid.actuallyadditions.refinedcanolaoil=Huile fluid.actuallyadditions.canolaoil=Huile de Colza fluid.actuallyadditions.crystaloil=Huile cristallisée fluid.actuallyadditions.empoweredoil=Huile Puissante @@ -178,7 +178,7 @@ tile.actuallyadditions.block_treasure_chest.name=Coffre au trésor tile.actuallyadditions.block_canola_press.name=Presse à colza tile.actuallyadditions.block_fermenting_barrel.name=Baril de fermentation tile.actuallyadditions.block_canola_oil.name=Huile de colza -tile.actuallyadditions.block_oil.name=Huile +tile.actuallyadditions.block_refined_canola_oil.name=Huile tile.actuallyadditions.block_crystal_oil.name=Huile cristallisée tile.actuallyadditions.block_empowered_oil.name=Huile puissante tile.actuallyadditions.block_misc_enderpearl.name=Block de perle de l'ender diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_CN.lang b/src/main/resources/assets/actuallyadditions/lang/zh_CN.lang index 0006a9a7a..70b75eb6e 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_CN.lang +++ b/src/main/resources/assets/actuallyadditions/lang/zh_CN.lang @@ -4,7 +4,7 @@ achievement.page.actuallyadditions=实用拓展 actuallyadditions.lolWutHowUDoDis.name=这东西出bug了。请扔了它。 #Fluids -fluid.actuallyadditions.oil=原油 +fluid.actuallyadditions.refinedcanolaoil=原油 fluid.actuallyadditions.canolaoil=菜籽油 #Banners diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_flowing.png b/src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_flowing.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_flowing.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_flowing.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_flowing.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_flowing.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_flowing.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_still.png b/src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_still.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_still.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_still.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_still.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/block_oil_still.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/blocks/block_refined_canola_oil_still.png.mcmeta