Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x

Browse source 
Conflicts:
	build.gradle
This commit is contained in:
asiekierka 2015-03-25 16:31:22 +01:00
commit cef844212d
9 changed files with 75 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildcraft_resources/changelog/6.4.5 Normal file
View file

@ -0,0 +1,5 @@
Bugfixes:
* [#2585] Dupe bug with Thermal Expansion (asie)
* [#2582] Laser rendering not working properly with solid blocks on front (davboecki)
* (Fix attempt) [#2584] Filler lag when out of blocks (asie)
* Massive FPS lag with filler/builder effects (asie)

2
buildcraft_resources/versions.txt
View file

@ -1,3 +1,3 @@
1.6.4:BuildCraft:4.2.2
1.7.2:BuildCraft:6.0.16
1.7.10:BuildCraft:6.4.4
1.7.10:BuildCraft:6.4.5

3
common/buildcraft/core/blueprints/BptBuilderBase.java
View file

@ -8,10 +8,7 @@
*/
package buildcraft.core.blueprints;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import org.apache.logging.log4j.Level;

105
common/buildcraft/core/blueprints/BptBuilderTemplate.java
View file

@ -30,8 +30,9 @@ import buildcraft.core.lib.utils.BlockUtils;
public class BptBuilderTemplate extends BptBuilderBase {
private LinkedList<BuildingSlotBlock> clearList = new LinkedList<BuildingSlotBlock>();
private LinkedList<BuildingSlotBlock> buildList = new LinkedList<BuildingSlotBlock>();
private BuildingSlotIterator iterator;
private BuildingSlotIterator iteratorBuild, iteratorClear;
public BptBuilderTemplate(BlueprintBase bluePrint, World world, int x, int y, int z) {
super(bluePrint, world, x, y, z);
@ -65,7 +66,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
b.mode = Mode.ClearIfInvalid;
b.buildStage = 0;
buildList.add(b);
clearList.add(b);
}
}
}
@ -102,11 +103,12 @@ public class BptBuilderTemplate extends BptBuilderBase {
}
}
iterator = new BuildingSlotIterator(buildList);
iteratorBuild = new BuildingSlotIterator(buildList);
iteratorClear = new BuildingSlotIterator(clearList);
}
private void checkDone() {
if (buildList.size() == 0) {
if (buildList.size() == 0 && clearList.size() == 0) {
done = true;
} else {
done = false;
@ -120,7 +122,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
@Override
public BuildingSlot getNextBlock(World world, TileAbstractBuilder inv) {
if (buildList.size() != 0) {
if (buildList.size() != 0 || clearList.size() != 0) {
BuildingSlotBlock slot = internalGetNextBlock(world, inv);
checkDone();
@ -152,55 +154,64 @@ public class BptBuilderTemplate extends BptBuilderBase {
}
}
iterator.startIteration();
// Step 1: Check the cleared
iteratorClear.startIteration();
while (iteratorClear.hasNext()) {
BuildingSlotBlock slot = iteratorClear.next();
while (iterator.hasNext()) {
BuildingSlotBlock slot = iterator.next();
if (slot.buildStage > buildList.getFirst().buildStage) {
iterator.reset ();
return null;
if (slot.buildStage > clearList.getFirst().buildStage) {
iteratorClear.reset();
break;
}
if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z)
|| isBlockBreakCanceled(world, slot.x, slot.y, slot.z)) {
iterator.remove();
if (slot.mode == Mode.ClearIfInvalid) {
clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
} else {
builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
}
} else if (slot.mode == Mode.ClearIfInvalid) {
if (BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)) {
iterator.remove();
clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
} else {
if (canDestroy(builder, context, slot)) {
consumeEnergyToDestroy(builder, slot);
createDestroyItems(slot);
|| isBlockBreakCanceled(world, slot.x, slot.y, slot.z)
|| BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)) {
iteratorClear.remove();
clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
} else if (canDestroy(builder, context, slot)) {
consumeEnergyToDestroy(builder, slot);
createDestroyItems(slot);
result = slot;
iterator.remove();
clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
result = slot;
iteratorClear.remove();
clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
break;
}
}
} else if (slot.mode == Mode.Build) {
if (!BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)
|| isBlockPlaceCanceled(world, x, y, z, slot.schematic)) {
iterator.remove();
builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
} else {
if (builder.consumeEnergy(BuilderAPI.BUILD_ENERGY) && firstSlotToConsume != null) {
slot.addStackConsumed(firstSlotToConsume.decreaseStackInSlot(1));
result = slot;
iterator.remove();
builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
break;
}
}
break;
}
}
if (result != null) {
return result;
}
// Step 2: Check the built, but only if we have anything to place and enough energy
if (firstSlotToConsume == null || builder.getBattery().getEnergyStored() < BuilderAPI.BUILD_ENERGY) {
return null;
}
iteratorBuild.startIteration();
while (iteratorBuild.hasNext()) {
BuildingSlotBlock slot = iteratorBuild.next();
if (slot.buildStage > buildList.getFirst().buildStage) {
iteratorBuild.reset();
break;
}
if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z)
|| isBlockPlaceCanceled(world, x, y, z, slot.schematic)
|| !BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)) {
iteratorBuild.remove();
builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
} else if (builder.consumeEnergy(BuilderAPI.BUILD_ENERGY)) {
slot.addStackConsumed(firstSlotToConsume.decreaseStackInSlot(1));
result = slot;
iteratorBuild.remove();
builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
break;
}
}

1
common/buildcraft/core/builders/IBuildingItemsProvider.java
View file

@ -8,7 +8,6 @@
*/
package buildcraft.core.builders;
import java.util.ArrayList;
import java.util.Collection;
public interface IBuildingItemsProvider {

1
common/buildcraft/core/builders/TileAbstractBuilder.java
View file

@ -8,7 +8,6 @@
*/
package buildcraft.core.builders;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;

5
common/buildcraft/core/lib/engines/RenderEngine.java
View file

@ -170,15 +170,14 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor
bindTexture(chamberTexture);
float chamberf = 2F / 16F;
int chamberc = ((int) step + 2) / 2;
for (int i = 0; i <= step + 2; i += 2) {
chamber.render(factor);
GL11.glTranslatef(translate[0] * chamberf, translate[1] * chamberf, translate[2] * chamberf);
}
for (int i = 0; i <= step + 2; i += 2) {
GL11.glTranslatef(-translate[0] * chamberf, -translate[1] * chamberf, -translate[2] * chamberf);
}
GL11.glTranslatef(-translate[0] * chamberf * chamberc, -translate[1] * chamberf * chamberc, -translate[2] * chamberf * chamberc);
bindTexture(trunkTexture);

4
common/buildcraft/factory/BlockTank.java
View file

@ -131,6 +131,10 @@ public class BlockTank extends BlockBuildCraft {
}
}
} else if (current.getItem() instanceof IFluidContainerItem) {
if (current.stackSize != 1) {
return false;
}
if (!world.isRemote) {
IFluidContainerItem container = (IFluidContainerItem) current.getItem();
FluidStack liquid = container.getFluid(current);

5
common/buildcraft/silicon/BlockLaser.java
View file

@ -147,4 +147,9 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight {
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {
return false;
}
@Override
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
return true;
}
}