Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/block-bags'
Browse files Browse the repository at this point in the history
  • Loading branch information
@me4502
me4502 committed Mar 13, 2017
2 parents 7cb6ba8 + ad394dd commit 095f592
Show file tree
Hide file tree
Showing 22 changed files with 828 additions and 113 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/sk89q/craftbook/sponge/CraftBookPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public void discoverMechanics() {

//Standard Mechanics
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.variable.Variables", GameState.PRE_INITIALIZATION);
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.blockbags.BlockBagManager");
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.blockbags.BlockBagManager", GameState.PRE_INITIALIZATION);
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.BetterPhysics");
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.BetterPlants");
moduleController.registerModule("com.sk89q.craftbook.sponge.mechanics.BounceBlocks");
Expand Down
96 changes: 83 additions & 13 deletions src/main/java/com/sk89q/craftbook/sponge/mechanics/area/Bridge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
import com.sk89q.craftbook.core.util.PermissionNode;
import com.sk89q.craftbook.core.util.documentation.DocumentationProvider;
import com.sk89q.craftbook.sponge.CraftBookPlugin;
import com.sk89q.craftbook.sponge.mechanics.blockbags.BlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.EmbeddedBlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.MultiBlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.data.EmbeddedBlockBagData;
import com.sk89q.craftbook.sponge.util.BlockFilter;
import com.sk89q.craftbook.sponge.util.BlockUtil;
import com.sk89q.craftbook.sponge.util.SignUtil;
Expand All @@ -34,9 +38,14 @@
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.block.tileentity.Sign;
import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.entity.Item;
import org.spongepowered.api.entity.living.Humanoid;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.cause.Cause;
import org.spongepowered.api.event.cause.NamedCause;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.TranslatableText;
import org.spongepowered.api.text.translation.ResourceBundleTranslation;
Expand Down Expand Up @@ -143,24 +152,71 @@ public boolean triggerMechanic(Location<World> block, Sign sign, Humanoid human,
}
if (baseBlock.getBlock().equals(type) || (forceState != null && !forceState)) type = BlockTypes.AIR.getDefaultState();

while (baseBlock.getBlockX() != otherBase.getBlockX() || baseBlock.getBlockZ() != otherBase.getBlockZ()) {
baseBlock.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));

left = baseBlock.getRelative(SignUtil.getLeft(block));
ItemStack blockBagItem = ItemStack.builder().fromBlockState(otherBase.getBlock()).quantity(1).build();
BlockBag blockBag = getBlockBag(sign.getLocation());

for(int i = 0; i < leftBlocks; i++) {
left.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
left = left.getRelative(SignUtil.getLeft(block));
}
while (baseBlock.getBlockX() != otherBase.getBlockX() || baseBlock.getBlockZ() != otherBase.getBlockZ()) {
if (type.getType() == BlockTypes.AIR || blockBag.has(Lists.newArrayList(blockBagItem.copy()))) {
if (type.getType() == BlockTypes.AIR && baseBlock.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !baseBlock.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
baseBlock.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));

left = baseBlock.getRelative(SignUtil.getLeft(block));

for(int i = 0; i < leftBlocks; i++) {
if (type.getType() == BlockTypes.AIR && left.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !left.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
left.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
left = left.getRelative(SignUtil.getLeft(block));
}

right = baseBlock.getRelative(SignUtil.getRight(block));
right = baseBlock.getRelative(SignUtil.getRight(block));

for(int i = 0; i < rightBlocks; i++) {
if (type.getType() == BlockTypes.AIR && right.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !right.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
right.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
right = right.getRelative(SignUtil.getRight(block));
}

for(int i = 0; i < rightBlocks; i++) {
right.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
right = right.getRelative(SignUtil.getRight(block));
baseBlock = baseBlock.getRelative(back);
} else {
if (human instanceof Player) {
((Player) human).sendMessage(Text.of("Out of blocks!"));
}
break;
}
}

baseBlock = baseBlock.getRelative(back);
if (blockBag instanceof EmbeddedBlockBag) {
sign.getLocation().offer(new EmbeddedBlockBagData((EmbeddedBlockBag) blockBag));
}
} else {
if (human instanceof CommandSource) ((CommandSource) human).sendMessage(Text.builder("Bridge not activatable from here!").build());
Expand All @@ -170,6 +226,20 @@ public boolean triggerMechanic(Location<World> block, Sign sign, Humanoid human,
return true;
}

@Override
public BlockBag getBlockBag(Location<World> location) {
BlockBag mainBlockBag = super.getBlockBag(location);
Location<World> next = BlockUtil.getNextMatchingSign(location, SignUtil.getBack(location), maximumLength.getValue() + 2, this::isMechanicSign);
if (next != null) {
BlockBag nextBlockBag = super.getBlockBag(next);
if (nextBlockBag != null) {
return new MultiBlockBag(mainBlockBag, nextBlockBag);
}
}

return mainBlockBag;
}

@Override
public String[] getValidSigns() {
return new String[]{"[Bridge]", "[Bridge End]"};
Expand Down
103 changes: 88 additions & 15 deletions src/main/java/com/sk89q/craftbook/sponge/mechanics/area/Door.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
import com.sk89q.craftbook.core.util.PermissionNode;
import com.sk89q.craftbook.core.util.documentation.DocumentationProvider;
import com.sk89q.craftbook.sponge.CraftBookPlugin;
import com.sk89q.craftbook.sponge.mechanics.blockbags.BlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.EmbeddedBlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.MultiBlockBag;
import com.sk89q.craftbook.sponge.mechanics.blockbags.data.EmbeddedBlockBagData;
import com.sk89q.craftbook.sponge.util.BlockFilter;
import com.sk89q.craftbook.sponge.util.BlockUtil;
import com.sk89q.craftbook.sponge.util.SignUtil;
Expand All @@ -33,9 +37,14 @@
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.block.tileentity.Sign;
import org.spongepowered.api.command.CommandSource;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.entity.Item;
import org.spongepowered.api.entity.living.Humanoid;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.cause.Cause;
import org.spongepowered.api.event.cause.NamedCause;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.util.Direction;
import org.spongepowered.api.world.Location;
Expand Down Expand Up @@ -126,24 +135,71 @@ public boolean triggerMechanic(Location<World> block, Sign sign, Humanoid human,
BlockState type = block.getRelative(back).getBlock();
if (baseBlock.getBlock().equals(type) || (forceState != null && !forceState)) type = BlockTypes.AIR.getDefaultState();

while (baseBlock.getBlockY() != otherSide.getBlockY() + (back == Direction.UP ? -1 : 1)) {
baseBlock.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));

left = baseBlock.getRelative(SignUtil.getLeft(block));

for(int i = 0; i < leftBlocks; i++) {
left.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
left = left.getRelative(SignUtil.getLeft(block));
}
ItemStack blockBagItem = ItemStack.builder().fromBlockState(otherBase.getBlock()).quantity(1 + leftBlocks + rightBlocks).build();
BlockBag blockBag = getBlockBag(sign.getLocation());

right = baseBlock.getRelative(SignUtil.getRight(block));

for(int i = 0; i < rightBlocks; i++) {
right.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
right = right.getRelative(SignUtil.getRight(block));
while (baseBlock.getBlockY() != otherSide.getBlockY() + (back == Direction.UP ? -1 : 1)) {
if (type.getType() == BlockTypes.AIR || blockBag.has(Lists.newArrayList(blockBagItem.copy()))) {
if (type.getType() == BlockTypes.AIR && baseBlock.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !baseBlock.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
baseBlock.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));

left = baseBlock.getRelative(SignUtil.getLeft(block));

for (int i = 0; i < leftBlocks; i++) {
if (type.getType() == BlockTypes.AIR && left.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !left.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
left.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
left = left.getRelative(SignUtil.getLeft(block));
}

right = baseBlock.getRelative(SignUtil.getRight(block));

for (int i = 0; i < rightBlocks; i++) {
if (type.getType() == BlockTypes.AIR && right.getBlock().equals(otherBase.getBlock())) {
for (ItemStack leftover : blockBag.add(Lists.newArrayList(blockBagItem.copy()))) {
Item item = (Item) block.getExtent().createEntity(EntityTypes.ITEM, sign.getLocation().getPosition());
item.offer(Keys.REPRESENTED_ITEM, leftover.createSnapshot());
block.getExtent().spawnEntity(item, CraftBookPlugin.spongeInst().getCause().build());
}
} else if (type.getType() != BlockTypes.AIR && !right.getBlock().equals(otherBase.getBlock())) {
if (!blockBag.remove(Lists.newArrayList(blockBagItem.copy())).isEmpty()) {
continue;
}
}
right.setBlock(type, Cause.of(NamedCause.source(CraftBookPlugin.spongeInst().getContainer())));
right = right.getRelative(SignUtil.getRight(block));
}

baseBlock = baseBlock.getRelative(back);
} else {
if (human instanceof Player) {
((Player) human).sendMessage(Text.of("Out of blocks!"));
}
break;
}
}

baseBlock = baseBlock.getRelative(back);
if (blockBag instanceof EmbeddedBlockBag) {
sign.getLocation().offer(new EmbeddedBlockBagData((EmbeddedBlockBag) blockBag));
}
} else {
if (human instanceof CommandSource) ((CommandSource) human).sendMessage(Text.builder("Door not activatable from here!").build());
Expand All @@ -153,6 +209,23 @@ public boolean triggerMechanic(Location<World> block, Sign sign, Humanoid human,
return true;
}

@Override
public BlockBag getBlockBag(Location<World> location) {
BlockBag mainBlockBag = super.getBlockBag(location);
if (SignUtil.isSign(location)) {
Direction back = "[Door Up]".equals(SignUtil.getTextRaw((Sign) location.getTileEntity().get(), 1)) ? Direction.UP : Direction.DOWN;
Location<World> next = BlockUtil.getNextMatchingSign(location, back, maximumLength.getValue() + 2, this::isMechanicSign);
if (next != null) {
BlockBag nextBlockBag = super.getBlockBag(next);
if (nextBlockBag != null) {
return new MultiBlockBag(mainBlockBag, nextBlockBag);
}
}
}

return mainBlockBag;
}

@Override
public String[] getValidSigns() {
return new String[]{"[Door Up]", "[Door Down]", "[Door]"};
Expand Down
Loading

0 comments on commit 095f592

Please sign in to comment.