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

improve builder logic for certain vanilla blocks

Browse source
This commit is contained in:
asiekierka 2015-09-12 16:03:09 +02:00
parent c0c29f7521
commit 832d979fe8
10 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftBuilders.java
View file

@ -129,6 +129,7 @@ import buildcraft.core.TilePathMarker;
import buildcraft.core.Version;
import buildcraft.core.blueprints.SchematicRegistry;
import buildcraft.core.builders.schematics.SchematicBlockCreative;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
import buildcraft.core.builders.schematics.SchematicFree;
import buildcraft.core.builders.schematics.SchematicIgnore;
import buildcraft.core.builders.schematics.SchematicRotateMeta;
@ -369,6 +370,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
schemes.registerSchematicBlock(Blocks.redstone_torch, SchematicWallSide.class);
schemes.registerSchematicBlock(Blocks.unlit_redstone_torch, SchematicWallSide.class);
schemes.registerSchematicBlock(Blocks.tripwire, SchematicBlockFloored.class);
schemes.registerSchematicBlock(Blocks.tripwire_hook, SchematicTripWireHook.class);
schemes.registerSchematicBlock(Blocks.skull, SchematicSkull.class);

3
common/buildcraft/builders/schematics/SchematicCactus.java
View file

@ -15,8 +15,9 @@ import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicCactus extends SchematicBlock {
public class SchematicCactus extends SchematicBlockFloored {
@Override
public void getRequirementsForPlacement(IBuilderContext context, LinkedList<ItemStack> requirements) {

3
common/buildcraft/builders/schematics/SchematicDoor.java
View file

@ -16,8 +16,9 @@ import net.minecraft.nbt.NBTTagCompound;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.MappingRegistry;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicDoor extends SchematicBlock {
public class SchematicDoor extends SchematicBlockFloored {
final ItemStack stack;

4
common/buildcraft/builders/schematics/SchematicRail.java
View file

@ -14,9 +14,9 @@ import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRail extends SchematicBlock {
public class SchematicRail extends SchematicBlockFloored {
@Override
public void rotateLeft(IBuilderContext context) {
switch (meta) {

3
common/buildcraft/builders/schematics/SchematicRedstoneDiode.java
View file

@ -15,8 +15,9 @@ import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRedstoneDiode extends SchematicBlock {
public class SchematicRedstoneDiode extends SchematicBlockFloored {
private Item baseItem;
public SchematicRedstoneDiode(Item baseItem) {

5
common/buildcraft/builders/schematics/SchematicRedstoneWire.java
View file

@ -14,9 +14,9 @@ import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicRedstoneWire extends SchematicBlock {
public class SchematicRedstoneWire extends SchematicBlockFloored {
final ItemStack customStack;
public SchematicRedstoneWire(ItemStack customStack) {
@ -42,5 +42,4 @@ public class SchematicRedstoneWire extends SchematicBlock {
public boolean isAlreadyBuilt(IBuilderContext context, int x, int y, int z) {
return block == context.world().getBlock(x, y, z);
}
}

4
common/buildcraft/builders/schematics/SchematicSeeds.java
View file

@ -15,9 +15,9 @@ import net.minecraft.item.ItemStack;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.core.builders.schematics.SchematicBlockFloored;
public class SchematicSeeds extends SchematicBlock {
public class SchematicSeeds extends SchematicBlockFloored {
public Item seeds;
public SchematicSeeds (Item seeds) {

10
common/buildcraft/core/blueprints/BptBuilderBlueprint.java
View file

@ -117,7 +117,6 @@ public class BptBuilderBlueprint extends BptBuilderBase {
}
LinkedList<BuildingSlotBlock> tmpStandalone = new LinkedList<BuildingSlotBlock>();
LinkedList<BuildingSlotBlock> tmpSupported = new LinkedList<BuildingSlotBlock>();
LinkedList<BuildingSlotBlock> tmpExpanding = new LinkedList<BuildingSlotBlock>();
for (int j = 0; j < blueprint.sizeY; ++j) {
@ -156,13 +155,9 @@ public class BptBuilderBlueprint extends BptBuilderBase {
tmpStandalone.add(b);
b.buildStage = 1;
break;
case SUPPORTED:
tmpSupported.add(b);
b.buildStage = 2;
break;
case EXPANDING:
tmpExpanding.add(b);
b.buildStage = 3;
b.buildStage = 2;
break;
}
} else {
@ -175,9 +170,6 @@ public class BptBuilderBlueprint extends BptBuilderBase {
for (BuildingSlotBlock b : tmpStandalone) {
addToBuildList(b);
}
for (BuildingSlotBlock b : tmpSupported) {
addToBuildList(b);
}
for (BuildingSlotBlock b : tmpExpanding) {
addToBuildList(b);
}

11
common/buildcraft/core/builders/schematics/SchematicBlockFloored.java Normal file
View file

@ -0,0 +1,11 @@
package buildcraft.core.builders.schematics;
import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
public class SchematicBlockFloored extends SchematicBlock {
@Override
public boolean canPlaceInWorld(IBuilderContext context, int x, int y, int z) {
return y > 0 && !context.world().isAirBlock(x, y - 1, z);
}
}

25
common/buildcraft/core/builders/schematics/SchematicWallSide.java
View file

@ -12,6 +12,31 @@ import buildcraft.api.blueprints.IBuilderContext;
import buildcraft.api.blueprints.SchematicBlock;
public class SchematicWallSide extends SchematicBlock {
@Override
public boolean canPlaceInWorld(IBuilderContext context, int x, int y, int z) {
final int yPos = 0;
final int yNeg = 5;
final int xPos = 2;
final int xNeg = 1;
final int zPos = 4;
final int zNeg = 3;
switch (meta & 7) {
case xPos:
return !context.world().isAirBlock(x + 1, y, z);
case xNeg:
return !context.world().isAirBlock(x - 1, y, z);
case yPos:
return !context.world().isAirBlock(x, y + 1, z);
case yNeg:
return !context.world().isAirBlock(x, y - 1, z);
case zPos:
return !context.world().isAirBlock(x, y, z + 1);
case zNeg:
return !context.world().isAirBlock(x, y, z - 1);
}
return true;
}
@Override
public void rotateLeft(IBuilderContext context) {