Fixed a load of little bugs that were put in when I changed the stuffz

src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java

@@ -92,7 +92,7 @@ public class InitBooklet{
         new BookletChapter("phantomBreaker", entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomBreaker), new PageTextOnly(1).addTextReplacement("<range>", TileEntityPhantomPlacer.RANGE), new PageCrafting(2, BlockCrafting.recipePhantomPlacer).setNoText(), new PageCrafting(3, BlockCrafting.recipePhantomBreaker).setNoText());
         new BookletChapter("esd", entryFunctionalNonRF, new ItemStack(InitBlocks.blockInputterAdvanced), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeESD).setNoText(), new PageCrafting(3, BlockCrafting.recipeAdvancedESD).setNoText()).setSpecial();
         new BookletChapter("xpSolidifier", entryFunctionalNonRF, new ItemStack(InitBlocks.blockXPSolidifier), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal())), new PageCrafting(2, BlockCrafting.recipeSolidifier).setNoText()).setSpecial();
-        new BookletChapter("greenhouseGlass", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass).setNoText());
+        new BookletChapter("greenhouseGlass", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass));
         new BookletChapter("fishingNet", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText());
         new BookletChapter("feeder", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText());
         new BookletChapter("compost", entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("<num>", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood));

src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java

@@ -12,11 +12,11 @@ package ellpeck.actuallyadditions.inventory.gui;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.inventory.ContainerCanolaPress;
 import ellpeck.actuallyadditions.tile.TileEntityBase;
 import ellpeck.actuallyadditions.tile.TileEntityCanolaPress;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
@@ -45,7 +45,7 @@ public class GuiCanolaPress extends GuiContainer{
             this.func_146283_a(Collections.singletonList(text1), x, y);
         }
 
-        String text2 = this.press.tank.getFluidAmount()+"/"+this.press.tank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil");
+        String text2 = this.press.tank.getFluidAmount()+"/"+this.press.tank.getCapacity()+" mB "+InitBlocks.fluidCanolaOil.getLocalizedName();
         if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){
             this.func_146283_a(Collections.singletonList(text2), x, y);
         }

src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java

@@ -12,11 +12,11 @@ package ellpeck.actuallyadditions.inventory.gui;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.inventory.ContainerFermentingBarrel;
 import ellpeck.actuallyadditions.tile.TileEntityBase;
 import ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
@@ -41,12 +41,12 @@ public class GuiFermentingBarrel extends GuiContainer{
     public void drawScreen(int x, int y, float f){
         super.drawScreen(x, y, f);
 
-        String text1 = this.press.canolaTank.getFluidAmount()+"/"+this.press.canolaTank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil");
+        String text1 = this.press.canolaTank.getFluidAmount()+"/"+this.press.canolaTank.getCapacity()+" mB "+InitBlocks.fluidCanolaOil.getLocalizedName();
         if(x >= guiLeft+61 && y >= guiTop+6 && x <= guiLeft+76 && y <= guiTop+88){
             this.func_146283_a(Collections.singletonList(text1), x, y);
         }
 
-        String text2 = this.press.oilTank.getFluidAmount()+"/"+this.press.oilTank.getCapacity()+" mB "+StringUtil.localize("fluid.oil");
+        String text2 = this.press.oilTank.getFluidAmount()+"/"+this.press.oilTank.getCapacity()+" mB "+InitBlocks.fluidOil.getLocalizedName();
         if(x >= guiLeft+99 && y >= guiTop+6 && x <= guiLeft+114 && y <= guiTop+88){
             this.func_146283_a(Collections.singletonList(text2), x, y);
         }

src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java

@@ -12,11 +12,11 @@ package ellpeck.actuallyadditions.inventory.gui;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.inventory.ContainerOilGenerator;
 import ellpeck.actuallyadditions.tile.TileEntityBase;
 import ellpeck.actuallyadditions.tile.TileEntityOilGenerator;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
@@ -44,7 +44,7 @@ public class GuiOilGenerator extends GuiContainer{
         if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){
             this.func_146283_a(Collections.singletonList(text1), x, y);
         }
-        String text2 = this.generator.tank.getFluidAmount()+"/"+this.generator.tank.getCapacity()+" mB "+StringUtil.localize("fluid.oil");
+        String text2 = this.generator.tank.getFluidAmount()+"/"+this.generator.tank.getCapacity()+" mB "+InitBlocks.fluidOil.getLocalizedName();
         if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){
             this.func_146283_a(Collections.singletonList(text2), x, y);
         }

src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java

@@ -44,7 +44,7 @@ public class ItemSeed extends ItemSeeds{
     }
 
     private void register(){
-        this.setUnlocalizedName(ModUtil.MOD_ID_LOWER+":"+this.getBaseName());
+        this.setUnlocalizedName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName());
         GameRegistry.registerItem(this, this.getBaseName());
     }
 

src/main/java/ellpeck/actuallyadditions/tile/TileEntityCoffeeMachine.java

@@ -162,7 +162,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
 
     @Override
     public boolean isItemValidForSlot(int i, ItemStack stack){
-        return (i >= 3 && ItemCoffee.getIngredientFromStack(stack) != null) || (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal());
+        return (i >= 3 && ItemCoffee.getIngredientFromStack(stack) != null) || (i == SLOT_COFFEE_BEANS && stack.getItem() == InitItems.itemCoffeeBean) || (i == SLOT_INPUT && stack.getItem() == InitItems.itemMisc && stack.getItemDamage() == TheMiscItems.CUP.ordinal()) || (i == SLOT_WATER_INPUT && FluidContainerRegistry.containsFluid(stack, new FluidStack(FluidRegistry.WATER, 1)));
     }
 
     @Override

src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java

@@ -42,12 +42,18 @@ public class TileEntityFeeder extends TileEntityInventoryBase{
     public void writeSyncableNBT(NBTTagCompound compound, boolean sync){
         super.writeSyncableNBT(compound, sync);
         compound.setInteger("Timer", this.currentTimer);
+        if(sync){
+            compound.setInteger("Animals", this.currentAnimalAmount);
+        }
     }
 
     @Override
     public void readSyncableNBT(NBTTagCompound compound, boolean sync){
         super.readSyncableNBT(compound, sync);
         this.currentTimer = compound.getInteger("Timer");
+        if(sync){
+            this.currentAnimalAmount = compound.getInteger("Animals");
+        }
     }
 
     @Override

src/main/java/ellpeck/actuallyadditions/tile/TileEntityHeatCollector.java

@@ -48,7 +48,7 @@ public class TileEntityHeatCollector extends TileEntityBase implements IEnergyPr
                     this.storage.receiveEnergy(ENERGY_PRODUCE, false);
                     this.markDirty();
 
-                    if(Util.RANDOM.nextInt(10) == 0){
+                    if(Util.RANDOM.nextInt(10000) == 0){
                         int randomSide = blocksAround.get(Util.RANDOM.nextInt(blocksAround.size()));
                         WorldUtil.breakBlockAtSide(WorldUtil.getDirectionBySidesInOrder(randomSide), worldObj, xCoord, yCoord, zCoord);
                     }

src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java

@@ -81,6 +81,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP
                 this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord-1, this.zCoord);
                 this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord+1);
                 this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord-1);
+                this.sendUpdate();
                 this.markDirty();
             }
         }

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -491,6 +491,7 @@ booklet.actuallyadditions.chapter.xpSolidifier.text.1=The <item>Experience Solid
 
 booklet.actuallyadditions.chapter.greenhouseGlass.name=Greenhouse Glass
 booklet.actuallyadditions.chapter.greenhouseGlass.text.1=<item>Greenhouse Glass<r> is a very effective way to <imp>speed up the growth of your plants<r>! When placed anywhere above the plant, as long as there are no blocks below obstructing the path, and there is sunlight above the glass, it will <imp>significantly speed up the growth of the plant<r>! <n>It obviously has to be daytime, too. Thought that was obvious.
+booklet.actuallyadditions.chapter.greenhouseGlass.text.2=<i>Greenhouse Gas
 
 booklet.actuallyadditions.chapter.fishingNet.name=Fishing Net
 booklet.actuallyadditions.chapter.fishingNet.text.1=The <item>Fishing Net<r> is a block that makes fishing a lot easier! Just <imp>place it above some water<r> and it will, given a little bit of time, automatically catch fish for you! To store the fish, just place a chest above the <item>Fishing Net<r> or let the items spew out of the top and collect them manually. <n><n><i>For the impatient