Merge branch 'master' of github.com:SirSengir/BuildCraft
This commit is contained in:
commit
1befa02ad5
4 changed files with 20 additions and 10 deletions
buildcraft_client/net/minecraft/src/buildcraft/core
buildcraft_resources/lang/buildcraft
common/net/minecraft/src/buildcraft
|
@ -60,7 +60,7 @@ public class CoreProxy {
|
|||
}
|
||||
|
||||
public static void setField804(EntityItem item, float value) {
|
||||
item.field_804_d = value;
|
||||
item.hoverStart = value;
|
||||
}
|
||||
|
||||
public static File getPropertyFile() {
|
||||
|
|
|
@ -64,6 +64,10 @@ item.PipePowerStone=Konduktivt stenr\u00c3\u00b6r
|
|||
item.PipePowerGold=Konduktivt guldr\u00c3\u00b6r
|
||||
item.PipeItemsStripes=Randigt transportr\u00c3\u00b6r
|
||||
item.PipeStructureCobblestone=Kullerstens strukturr\u00c3\u00b6r
|
||||
item.PipeItemsVoid=Annulleringstransportr\u00c3\u00b6r
|
||||
item.PipeLiquidsVoid=Vattent\u00c3\u00a4tt annulleringstransportr\u00c3\u00b6r
|
||||
item.PipeItemsSandstone=Sandstenstransportr\u00c3\u00b6r
|
||||
item.PipeLiquidsSandstone=Vattent\u00c3\u00a4tt Sandstensr\u00c3\u00b6r
|
||||
tile.miningWellBlock=Gruvborr
|
||||
tile.plainPipeBlock=Gruvr\u00c3\u00b6r
|
||||
tile.autoWorkbenchBlock=Automatiskt arbetsb\u00c3\u00a4nk
|
||||
|
@ -83,4 +87,4 @@ tile.blockHopper=Hopper
|
|||
tile.pumpBlock=Pump
|
||||
tile.engineWood=R\u00c3\u00b6dstenmotor
|
||||
tile.engineStone=\u00c3\u0085ngmotor
|
||||
tile.engineIron=F\u00c3\u00b6rbr\u00c3\u00a4nningsmotor
|
||||
tile.engineIron=F\u00c3\u00b6rbr\u00c3\u00a4nningsmotor
|
||||
|
|
|
@ -171,9 +171,9 @@ public class EntityRobot extends Entity implements ISpawnHandler {
|
|||
destY = y;
|
||||
destZ = z;
|
||||
|
||||
motionX = (destX - posX) / 75 * laser.getPowerAverage() / 2;
|
||||
motionY = (destY - posY) / 75 * laser.getPowerAverage() / 2;
|
||||
motionZ = (destZ - posZ) / 75 * laser.getPowerAverage() / 2;
|
||||
motionX = (destX - posX) / 75 * (laser.getPowerAverage() / 2 + 1);
|
||||
motionY = (destY - posY) / 75 * (laser.getPowerAverage() / 2 + 1);
|
||||
motionZ = (destZ - posZ) / 75 * (laser.getPowerAverage() / 2 + 1);
|
||||
}
|
||||
|
||||
protected boolean reachedDesination() {
|
||||
|
@ -246,9 +246,12 @@ public class EntityRobot extends Entity implements ISpawnHandler {
|
|||
|
||||
Action a = targets.getFirst();
|
||||
BptSlotInfo target = a.slot;
|
||||
|
||||
laser.setPositions(new Position(posX, posY, posZ), new Position(target.x + 0.5, target.y + 0.5, target.z + 0.5));
|
||||
laser.show();
|
||||
|
||||
if (target != null) {
|
||||
|
||||
laser.setPositions(new Position(posX, posY, posZ), new Position(target.x + 0.5, target.y + 0.5, target.z + 0.5));
|
||||
laser.show();
|
||||
}
|
||||
}
|
||||
else {
|
||||
laser.hide();
|
||||
|
|
|
@ -456,12 +456,15 @@ public class TileQuarry extends TileMachine implements IArmListener, IMachine, I
|
|||
}
|
||||
|
||||
@Override
|
||||
public void invalidate () {
|
||||
destroy ();
|
||||
public void invalidate() {
|
||||
|
||||
super.invalidate();
|
||||
destroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroy() {
|
||||
|
||||
if (arm != null) {
|
||||
arm.setDead();
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue