Updated to 0.0.5.0!

newestVersion.txt

@@ -1 +1 @@
-1.7.10-0.0.4.4
+1.7.10-0.0.5.0

src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java

@@ -52,7 +52,8 @@ public class BlockPlant extends BlockCrops implements INameableItem, IFactoryHar
                     ret.add(new ItemStack(this.seedItem));
                 }
             }
-            ret.add(this.returnItem.copy());
+            if(this == InitBlocks.blockCanola) ret.add(new ItemStack(this.returnItem.getItem(), new Random().nextInt(3)+3, this.returnItem.getItemDamage()));
+            else ret.add(this.returnItem.copy());
         }
 
         return ret;

src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java

@@ -61,15 +61,18 @@ public enum ConfigIntValues{
     FURNACE_ENERGY_USED("Energy Use: Double Furnace", ConfigCategories.MACHINE_VALUES, 25, 1, 500, "The Amount of Energy used by the Double Furnace per Tick"),
 
     PRESS_PROCESSING_TIME("Canola Press: Processing Time", ConfigCategories.MACHINE_VALUES, 30, 1, 1000, "The Amount of time it takes to process one Canola"),
-    PRESS_MB_PRODUCED("Canola Press: mB Produced", ConfigCategories.MACHINE_VALUES, 30, 1, 5000, "The Amount of Canola Oil produced from one Canola"),
+    PRESS_MB_PRODUCED("Canola Press: mB Produced", ConfigCategories.MACHINE_VALUES, 100, 1, 5000, "The Amount of Canola Oil produced from one Canola"),
     PRESS_ENERGY_USED("Energy Use: Canola Press", ConfigCategories.MACHINE_VALUES, 35, 10, 500, "The Amount of Energy used by the Canola Press per Tick"),
 
     BARREL_MB_PRODUCED("Fermenting Barrel: mB Produced", ConfigCategories.MACHINE_VALUES, 50, 1, 3000, "The Amount of mB produced by the Barrel per cycle"),
     BARREL_PROCESSING_TIME("Fermenting Barrel: Processing Time", ConfigCategories.MACHINE_VALUES, 100, 1, 5000, "The Amount of time it takes to process one Canola Oil to Oil"),
-
     COAL_GEN_ENERGY_PRODUCED("Coal Generator: Energy Produced", ConfigCategories.MACHINE_VALUES, 30, 1, 500, "The Amount of Energy generated by the Coal Generator"),
 
-    PHANTOMFACE_RANGE("Phantomface: Default Range", ConfigCategories.MACHINE_VALUES, 16, 3, 100, "The Default Range of the Phantomface");
+    PHANTOMFACE_RANGE("Phantomface: Default Range", ConfigCategories.MACHINE_VALUES, 16, 3, 100, "The Default Range of the Phantomface"),
+
+    OIL_GEN_ENERGY_PRODUCED("Oil Generator: Energy Produced", ConfigCategories.MACHINE_VALUES, 76, 1, 500, "The Amount of Energy generated by the Oil Generator"),
+    OIL_GEN_FUEL_USED("Oil Generator: Fuel Usage", ConfigCategories.MACHINE_VALUES, 50, 1, 300, "The Amount of Fuel used per Burnup in the Oil Generator"),
+    OIL_GEN_BURN_TIME("Oil Generator: Burn Time", ConfigCategories.MACHINE_VALUES, 100, 1, 1000, "The Amount of Time Fuel keeps burning for");
 
     public final String name;
     public final String category;

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

@@ -61,12 +61,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE
             if(this.currentProcessTime > 0) this.storage.extractEnergy(energyUsedPerTick, false);
 
             if(this.tank.getFluidAmount() > 0){
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.UP, this.tank);
                 WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.DOWN, this.tank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.NORTH, this.tank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.EAST, this.tank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.SOUTH, this.tank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.WEST, this.tank);
             }
         }
     }

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

@@ -13,7 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 public class TileEntityCoalGenerator extends TileEntityInventoryBase implements IEnergyReceiver{
 
-    public EnergyStorage storage = new EnergyStorage(30000, energyProducedPerTick+50);
+    public EnergyStorage storage = new EnergyStorage(60000, energyProducedPerTick+50);
 
     public static int energyProducedPerTick = ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue();
 
@@ -34,7 +34,7 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements
                 this.storage.receiveEnergy(energyProducedPerTick, false);
             }
 
-            if(energyProducedPerTick <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){
+            if(energyProducedPerTick*100 <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){
                 if(this.currentBurnTime <= 0 && this.slots[0] != null && TileEntityFurnace.getItemBurnTime(this.slots[0]) > 0){
                     this.maxBurnTime = TileEntityFurnace.getItemBurnTime(this.slots[0]);
                     this.currentBurnTime = this.maxBurnTime;

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

@@ -61,12 +61,7 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen
             }
 
             if(this.oilTank.getFluidAmount() > 0){
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.UP, this.oilTank);
                 WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.DOWN, this.oilTank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.NORTH, this.oilTank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.EAST, this.oilTank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.SOUTH, this.oilTank);
-                WorldUtil.pushFluid(worldObj, xCoord, yCoord, zCoord, ForgeDirection.WEST, this.oilTank);
             }
         }
     }
@@ -121,7 +116,7 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen
 
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill){
-        if(resource.getFluid() == FluidRegistry.getFluid(InitBlocks.fluidCanolaOil.getName())) return this.canolaTank.fill(resource, doFill);
+        if(from != ForgeDirection.DOWN && resource.getFluid() == FluidRegistry.getFluid(InitBlocks.fluidCanolaOil.getName())) return this.canolaTank.fill(resource, doFill);
         return 0;
     }
 
@@ -138,7 +133,7 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen
 
     @Override
     public boolean canFill(ForgeDirection from, Fluid fluid){
-        return fluid == FluidRegistry.getFluid(InitBlocks.fluidCanolaOil.getName());
+        return from != ForgeDirection.DOWN && fluid == FluidRegistry.getFluid(InitBlocks.fluidCanolaOil.getName());
     }
 
     @Override

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

@@ -1,6 +1,7 @@
 package ellpeck.actuallyadditions.tile;
 
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
+import ellpeck.actuallyadditions.util.FakePlayerUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockAir;
 import net.minecraft.block.BlockGrass;
@@ -9,8 +10,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.util.FakePlayerFactory;
 
 import java.util.Random;
 
@@ -53,6 +52,6 @@ public class TileEntityGreenhouseGlass extends TileEntityBase{
     }
 
     public boolean applyBonemealEffect(ChunkCoordinates coords){
-        return ItemDye.applyBonemeal(new ItemStack(Items.dye, 1, 15), worldObj, coords.posX, coords.posY, coords.posZ, FakePlayerFactory.getMinecraft((WorldServer)worldObj));
+        return ItemDye.applyBonemeal(new ItemStack(Items.dye, 1, 15), worldObj, coords.posX, coords.posY, coords.posZ, FakePlayerUtil.newFakePlayer(worldObj));
     }
 }

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

@@ -5,6 +5,7 @@ import cofh.api.energy.IEnergyProvider;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.blocks.InitBlocks;
+import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.util.WorldUtil;
 import net.minecraft.init.Items;
@@ -19,10 +20,10 @@ public class TileEntityOilGenerator extends TileEntityInventoryBase implements I
 
     public FluidTank tank = new FluidTank(2*FluidContainerRegistry.BUCKET_VOLUME);
 
-    public static int energyProducedPerTick = 76;
+    public static int energyProducedPerTick = ConfigIntValues.OIL_GEN_ENERGY_PRODUCED.getValue();
 
-    public int fuelUsedPerBurnup = 50;
+    public int fuelUsedPerBurnup = ConfigIntValues.OIL_GEN_FUEL_USED.getValue();
-    public int maxBurnTime = 100;
+    public int maxBurnTime = ConfigIntValues.OIL_GEN_BURN_TIME.getValue();
 
     public int currentBurnTime;
 
@@ -40,7 +41,7 @@ public class TileEntityOilGenerator extends TileEntityInventoryBase implements I
                 this.storage.receiveEnergy(energyProducedPerTick, false);
             }
 
-            if(energyProducedPerTick <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){
+            if(energyProducedPerTick*this.maxBurnTime/2 <= this.getMaxEnergyStored(ForgeDirection.UNKNOWN)-this.getEnergyStored(ForgeDirection.UNKNOWN)){
                 if(this.currentBurnTime <= 0 && this.tank.getFluidAmount() >= this.fuelUsedPerBurnup){
                     this.currentBurnTime = this.maxBurnTime;
                     this.tank.drain(this.fuelUsedPerBurnup, true);

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

@@ -34,7 +34,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase{
     }
 
     public boolean isBoundTileInRage(){
-        if(this.hasBoundTile() && this.boundTile.getWorldObj().loadedTileEntityList.contains(this.boundTile)){
+        if(this.hasBoundTile()){
             int xDif = this.boundTile.xCoord-this.xCoord;
             int yDif = this.boundTile.yCoord-this.yCoord;
             int zDif = this.boundTile.zCoord-this.zCoord;

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

@@ -52,7 +52,7 @@ item.actuallyadditions.itemBucketOil.name=Oil Bucket
 tooltip.actuallyadditions.itemBucketOil.desc=Made in a Fermenting Barrel from Canola Oil
 
 tile.actuallyadditions.blockPhantomface.name=Phantomface
-tooltip.actuallyadditions.blockPhantomface.desc.1=Like a Pipe, only Wireless! Connect me with a Phantom Connector!
+tooltip.actuallyadditions.blockPhantomface.desc.1=Like a Hopper-Chain, only Wireless! Connect me with a Phantom Connector!
 tooltip.actuallyadditions.blockPhantomface.desc.2=Input things into me to input into connected Blocks!
 
 item.actuallyadditions.itemPhantomConnector.name=Phantom Connector