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

made progress in improvement of block breaking, for #1571

Browse source
This commit is contained in:
SpaceToad 2014-04-04 09:33:55 +02:00
parent 1d97913609
commit c3c3a3d3f0
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/BuildCraftBuilders.java
View file

@ -30,11 +30,11 @@ import buildcraft.api.filler.IFillerPattern;
import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.ActionManager;
import buildcraft.builders.BlockArchitect; import buildcraft.builders.BlockArchitect;
import buildcraft.builders.BlockBlueprintLibrary; import buildcraft.builders.BlockBlueprintLibrary;
import buildcraft.builders.BlockBuildTool;
import buildcraft.builders.BlockBuilder; import buildcraft.builders.BlockBuilder;
import buildcraft.builders.BlockFiller; import buildcraft.builders.BlockFiller;
import buildcraft.builders.BlockMarker; import buildcraft.builders.BlockMarker;
import buildcraft.builders.BlockPathMarker; import buildcraft.builders.BlockPathMarker;
import buildcraft.builders.BlockStripes;
import buildcraft.builders.BuilderProxy; import buildcraft.builders.BuilderProxy;
import buildcraft.builders.EventHandlerBuilders; import buildcraft.builders.EventHandlerBuilders;
import buildcraft.builders.GuiHandler; import buildcraft.builders.GuiHandler;
@ -109,7 +109,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
public static final char BPT_SEP_CHARACTER = '-'; public static final char BPT_SEP_CHARACTER = '-';
public static final int LIBRARY_PAGE_SIZE = 12; public static final int LIBRARY_PAGE_SIZE = 12;
public static final int MAX_BLUEPRINTS_NAME_SIZE = 14; public static final int MAX_BLUEPRINTS_NAME_SIZE = 14;
public static BlockStripes stripesBlock; public static BlockBuildTool buildToolBlock;
public static BlockMarker markerBlock; public static BlockMarker markerBlock;
public static BlockPathMarker pathMarkerBlock; public static BlockPathMarker pathMarkerBlock;
public static BlockFiller fillerBlock; public static BlockFiller fillerBlock;
@ -298,8 +298,8 @@ public class BuildCraftBuilders extends BuildCraftMod {
LanguageRegistry.addName(blueprintItem, "Blueprint"); LanguageRegistry.addName(blueprintItem, "Blueprint");
CoreProxy.proxy.registerItem(blueprintItem); CoreProxy.proxy.registerItem(blueprintItem);
stripesBlock = new BlockStripes (); buildToolBlock = new BlockBuildTool ();
CoreProxy.proxy.registerBlock(stripesBlock); CoreProxy.proxy.registerBlock(buildToolBlock);
markerBlock = new BlockMarker(); markerBlock = new BlockMarker();
CoreProxy.proxy.registerBlock(markerBlock.setBlockName("markerBlock")); CoreProxy.proxy.registerBlock(markerBlock.setBlockName("markerBlock"));

6
common/buildcraft/builders/BlockStripes.java → common/buildcraft/builders/BlockBuildTool.java
View file

@ -15,9 +15,9 @@ import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class BlockStripes extends Block { public class BlockBuildTool extends Block {
public BlockStripes() { public BlockBuildTool() {
super(Material.iron); super(Material.iron);
} }
@ -31,6 +31,6 @@ public class BlockStripes extends Block {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) { public void registerBlockIcons(IIconRegister par1IconRegister) {
texture = par1IconRegister.registerIcon("buildcraft:blockStripesLaser"); texture = par1IconRegister.registerIcon("buildcraft:blockRedLaser");
} }
} }

2
common/buildcraft/builders/BuildingItem.java
View file

@ -109,7 +109,7 @@ public class BuildingItem implements IBuilder {
if (stacksToDisplay.size() == 0) { if (stacksToDisplay.size() == 0) {
StackAtPosition sPos = new StackAtPosition(); StackAtPosition sPos = new StackAtPosition();
sPos.stack = new ItemStack(BuildCraftBuilders.stripesBlock); sPos.stack = new ItemStack(BuildCraftBuilders.buildToolBlock);
stacksToDisplay.add(sPos); stacksToDisplay.add(sPos);
} }

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

@ -132,8 +132,17 @@ public class BptBuilderTemplate extends BptBuilderBase {
if (BlockUtil.isSoftBlock(world, slot.x, slot.y, slot.z)) { if (BlockUtil.isSoftBlock(world, slot.x, slot.y, slot.z)) {
iterator.remove(); iterator.remove();
} else { } else {
slot.addStackConsumed(new ItemStack( int hardness = (int) context
BuildCraftBuilders.stripesBlock)); .world()
.getBlock(slot.x, slot.y, slot.z)
.getBlockHardness(context.world(), slot.x, slot.y,
slot.z) + 1;
for (int i = 0; i < hardness; ++i) {
slot.addStackConsumed(new ItemStack(
BuildCraftBuilders.buildToolBlock));
}
result = slot; result = slot;
iterator.remove(); iterator.remove();