Closes #813 (#844)

* update oil fluid name

* resolve some npe

.gitignore

@@ -17,3 +17,4 @@
 .settings/org.eclipse.buildship.core.prefs
 *.launch
 .settings/org.eclipse.jdt.core.prefs
+*.prefs

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);
     }

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("<rf>", TileEntityFurnaceSolar.PRODUCE), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText());
         new BookletChapter("heatCollector", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("<rf>", TileEntityHeatCollector.ENERGY_PRODUCE).addTextReplacement("<min>", 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("<rf>", TileEntityLeafGenerator.ENERGY_PRODUCED).addTextReplacement("<range>", 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();
 

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]);
 

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));
 

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");
     }

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());
                         }

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!");
             }
         }
     };

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);
                 }
             }

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",

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

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 <item>Heat Collector<
 
 booklet.actuallyadditions.chapter.canola.name=Canola and Oil
 booklet.actuallyadditions.chapter.canola.text.1=Using <item>Canola<r>, you can make a simple, yet effective power generation system from <imp>natural resources<r>. <n>To do this, first find some <item>Canola Plants<r> in the wild and plant them on your farm. <n><n>The <item>Canola<r> you get out of them can be used in a <item>Canola Press<r> to make <item>Canola Oil<r>. <n><n>This can be <imp>used in an<r> <item>Oil Generator<r>. It displays the amount of power it generates in its GUI, however, it can be <imp>upgraded further<r> to yield <imp>more power<r> than that!
-booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a <item>Fermenting Barrel<r> to convert the <item>Canola Oil<r> into <item>Oil<r>. <n><n>If you're still not satisfied with the power that generates, <imp>place the oil on the ground<r> and throw in a <item>Crystallized Canola Seed<r> to make <item>Crystallized Oil<r>.  <n><n>If that isn't enough for you either, make an <item>Empowered Canola Seed<r> and toss that into some <item>Crystallized Oil<r> to get <item>Empowered Oil<r>!
+booklet.actuallyadditions.chapter.canola.text.2=For starters, you can use a <item>Fermenting Barrel<r> to convert the <item>Canola Oil<r> into <item>Refined Canola Oil<r>. <n><n>If you're still not satisfied with the power that generates, <imp>place the refined canola oil on the ground<r> and throw in a <item>Crystallized Canola Seed<r> to make <item>Crystallized Oil<r>.  <n><n>If that isn't enough for you either, make an <item>Empowered Canola Seed<r> and toss that into some <item>Crystallized Oil<r> to get <item>Empowered Oil<r>!
 booklet.actuallyadditions.chapter.canola.text.4=The <item>Fermenting Barrel<r> can have a <item>Comparator<r> attached to it which will result in the Redstone strength being equivalent to the <imp>percentage<r> of the <imp>output tank<r>.
 booklet.actuallyadditions.chapter.canola.text.5=If you break the <item>Oil Generator<r>, it will keep the liquid inside. <n>Place it in the <imp>crafting grid<r> to empty it out. <n>It will <imp>stop generating<r> when powered by <imp>Redstone<r>. <n>Additionally, using a <item>Comparator<r> will yield the percentage of <imp>energy stored<r>.
 

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

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

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