Auto-Sync

This commit is contained in:
DarkGuardsman 2013-11-04 23:12:34 -05:00
parent 3793f44c4f
commit 4537211850
32 changed files with 95 additions and 90 deletions

View file

@ -6,19 +6,20 @@ package com.builtbroken.common.science;
* @author DarkGuardsman */ * @author DarkGuardsman */
public class HeatingData public class HeatingData
{ {
/**(K) temperature kelvin that this material goes from solid to liquid, or back */ /** (K) temperature kelvin that this material goes from solid to liquid, or back */
public float meltingPoint; public float meltingPoint;
/**(K) temperature kelvin that this material goes from liquid to gas, or back */ /** (K) temperature kelvin that this material goes from liquid to gas, or back */
public float boilingPoint; public float boilingPoint;
/**(kJ/mol) Energy per gram needed to make the final leap from solid to liquid */ /** (kJ/mol) Energy per gram needed to make the final leap from solid to liquid */
public float fisionHeat; public float fisionHeat;
/**(kJ/mol) Energy per gram needed to make the final leap from liquid to gas */ /** (kJ/mol) Energy per gram needed to make the final leap from liquid to gas */
public float vaporHeat; public float vaporHeat;
/** (j/kg K) Rate at which the material heats at in its default matter stage. This does change per phase */ /** (j/kg K) Rate at which the material heats at in its default matter stage. This does change
* per phase */
public float specificHeat; public float specificHeat;
/** How much the material expands */ /** How much the material expands */
public float thermalExpasion; public float thermalExpasion;
/**(W/(m K)) How well does the material conduct heat */ /** (W/(m K)) How well does the material conduct heat */
public float thermalConductivity; public float thermalConductivity;
public HeatingData(float meltingPoint, float boilingPoint, float fisionHeat, float vaporHeat, float specificHeat) public HeatingData(float meltingPoint, float boilingPoint, float fisionHeat, float vaporHeat, float specificHeat)

View file

@ -26,7 +26,7 @@ public class AssemblyObjectManager
{ {
IAssemblyRecipe re = null; IAssemblyRecipe re = null;
if(re instanceof IAssemblyObject) if (re instanceof IAssemblyObject)
{ {
re = ((IAssemblyObject) object).getRecipe(object); re = ((IAssemblyObject) object).getRecipe(object);
} }
@ -34,7 +34,7 @@ public class AssemblyObjectManager
if (re == null && object instanceof ItemStack) if (re == null && object instanceof ItemStack)
{ {
re = itemRecipes.get(new Pair<Integer, Integer>(((ItemStack) object).itemID, ((ItemStack) object).getItemDamage())); re = itemRecipes.get(new Pair<Integer, Integer>(((ItemStack) object).itemID, ((ItemStack) object).getItemDamage()));
if(re == null && ((ItemStack) object).getItem() instanceof IAssemblyObject) if (re == null && ((ItemStack) object).getItem() instanceof IAssemblyObject)
{ {
re = ((IAssemblyObject) ((ItemStack) object).getItem()).getRecipe(object); re = ((IAssemblyObject) ((ItemStack) object).getItem()).getRecipe(object);
} }

View file

@ -1,6 +1,7 @@
package dark.api.reciepes; package dark.api.reciepes;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
/** Processor Recipe output Container. Input is controlled by the processor recipes class. */ /** Processor Recipe output Container. Input is controlled by the processor recipes class. */
public class ProcessorRecipe public class ProcessorRecipe
{ {

View file

@ -213,10 +213,10 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
for (ItemStack stack : drops) for (ItemStack stack : drops)
{ {
float f = 0.7F; float f = 0.7F;
double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d = (rand.nextFloat() * f) + (1.0F - f) * 0.5D;
double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d1 = (rand.nextFloat() * f) + (1.0F - f) * 0.5D;
double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (rand.nextFloat() * f) + (1.0F - f) * 0.5D;
EntityItem entityitem = new EntityItem(player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, stack); EntityItem entityitem = new EntityItem(player.worldObj, x + d, y + d1, z + d2, stack);
entityitem.delayBeforeCanPickup = 10; entityitem.delayBeforeCanPickup = 10;
player.worldObj.spawnEntityInWorld(entityitem); player.worldObj.spawnEntityInWorld(entityitem);
} }

View file

@ -80,6 +80,7 @@ public class BlockWire extends BlockMachine
return this.zeroRendering ? 0 : -1; return this.zeroRendering ? 0 : -1;
} }
@Override
public TileEntity createTileEntity(World world, int metadata) public TileEntity createTileEntity(World world, int metadata)
{ {
if (metadata == 1) if (metadata == 1)

View file

@ -21,7 +21,7 @@ public class TileEntitySwitchWire extends TileEntityWire
{ {
boolean p = this.activated; boolean p = this.activated;
this.activated = yes; this.activated = yes;
if(p != this.activated) if (p != this.activated)
{ {
this.refresh(); this.refresh();
} }

View file

@ -183,7 +183,8 @@ public class InvChest implements IInvBox
@Override @Override
public void onInventoryChanged() public void onInventoryChanged()
{ {
if(this.hostTile != null){ if (this.hostTile != null)
{
this.hostTile.onInventoryChanged(); this.hostTile.onInventoryChanged();
} }
} }
@ -191,7 +192,7 @@ public class InvChest implements IInvBox
@Override @Override
public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer)
{ {
if(this.hostTile != null) if (this.hostTile != null)
{ {
return this.hostTile.worldObj.getBlockTileEntity(this.hostTile.xCoord, this.hostTile.yCoord, this.hostTile.zCoord) != this.hostTile ? false : par1EntityPlayer.getDistanceSq(this.hostTile.xCoord + 0.5D, this.hostTile.yCoord + 0.5D, this.hostTile.zCoord + 0.5D) <= 64.0D; return this.hostTile.worldObj.getBlockTileEntity(this.hostTile.xCoord, this.hostTile.yCoord, this.hostTile.zCoord) != this.hostTile ? false : par1EntityPlayer.getDistanceSq(this.hostTile.xCoord + 0.5D, this.hostTile.yCoord + 0.5D, this.hostTile.zCoord + 0.5D) <= 64.0D;
} }

View file

@ -104,6 +104,7 @@ public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo
} }
} }
@Override
public void breakBlock(World world, int x, int y, int z, int par5, int par6) public void breakBlock(World world, int x, int y, int z, int par5, int par6)
{ {
super.breakBlock(world, x, y, z, par5, par6); super.breakBlock(world, x, y, z, par5, par6);