Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
dependencies {
implementation('com.github.GTNewHorizons:LunatriusCore:1.2.1-GTNH:dev')
compileOnly rfg.deobf('curse.maven:lotr-423748:4091561')
compileOnly('com.github.GTNewHorizons:ArchitectureCraft:1.12.10-feat-set-orientation.1+a970489b85:dev')
}
1 change: 1 addition & 0 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Add any additional repositories for your dependencies here

repositories {
mavenLocal()
maven {
name 'GTNH Maven'
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemStack;
import net.minecraft.network.play.client.C0BPacketEntityAction;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
Expand All @@ -27,6 +28,7 @@
import com.github.lunatrius.schematica.client.printer.registry.PlacementRegistry;
import com.github.lunatrius.schematica.client.util.BlockToItemStack;
import com.github.lunatrius.schematica.client.world.SchematicWorld;
import com.github.lunatrius.schematica.compat.architecturecraft.ArchitectureCraftHelper;
import com.github.lunatrius.schematica.handler.ConfigurationHandler;
import com.github.lunatrius.schematica.proxy.ClientProxy;
import com.github.lunatrius.schematica.reference.Constants;
Expand All @@ -44,6 +46,7 @@ public class SchematicPrinter {

private boolean isEnabled;
private boolean isPrinting;
private boolean currentBlockIsACShape;

private SchematicWorld schematic = null;
private byte[][][] timeout = null;
Expand Down Expand Up @@ -181,6 +184,14 @@ private boolean placeBlock(World world, EntityPlayer player, int x, int y, int z
if (placeBlock(world, player, wx, wy, wz, block, metadata, itemStack)) {
this.timeout[x][y][z] = (byte) ConfigurationHandler.timeout;

if (ArchitectureCraftHelper.isShapeBlock(block)) {
TileEntity schematicTE = this.schematic.getTileEntity(x, y, z);
if (schematicTE != null) {
byte[] orientation = ArchitectureCraftHelper.getOrientationFromTE(schematicTE);
ArchitectureCraftHelper.sendOrientationUpdate(wx, wy, wz, orientation[0], orientation[1]);
}
}

if (!ConfigurationHandler.placeInstantly) {
return true;
}
Expand Down Expand Up @@ -230,6 +241,8 @@ private ForgeDirection[] getSolidSides(World world, int x, int y, int z) {

private boolean placeBlock(World world, EntityPlayer player, int x, int y, int z, Block block, int metadata,
ItemStack itemStack) {
this.currentBlockIsACShape = ArchitectureCraftHelper.isShapeBlock(block);

if (isBlacklisted(block, itemStack)) {
return false;
}
Expand Down Expand Up @@ -404,6 +417,10 @@ private boolean swapToItem(InventoryPlayer inventory, ItemStack itemStack, boole
private int getInventorySlotWithItem(final InventoryPlayer inventory, final ItemStack itemStack) {
for (int i = 0; i < inventory.mainInventory.length; i++) {
if (inventory.mainInventory[i] != null && inventory.mainInventory[i].isItemEqual(itemStack)) {
if (this.currentBlockIsACShape
&& !ArchitectureCraftHelper.areShapeItemStacksEqual(itemStack, inventory.mainInventory[i])) {
continue;
}
return i;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import com.github.lunatrius.core.entity.EntityHelper;
import com.github.lunatrius.schematica.client.world.SchematicWorld;
import com.github.lunatrius.schematica.compat.architecturecraft.ArchitectureCraftHelper;
import com.github.lunatrius.schematica.reference.Reference;

public class BlockList {
Expand Down Expand Up @@ -59,7 +60,11 @@ public List<WrappedItemStack> getList(final EntityPlayer player, final Schematic
continue;
}

final WrappedItemStack wrappedItemStack = findOrCreateWrappedItemStackFor(blockList, stack);
final boolean isACShape = ArchitectureCraftHelper.isShapeBlock(block);
final WrappedItemStack wrappedItemStack = findOrCreateWrappedItemStackFor(
blockList,
stack,
isACShape);
if (isPlaced) {
wrappedItemStack.placed++;
}
Expand All @@ -69,25 +74,35 @@ public List<WrappedItemStack> getList(final EntityPlayer player, final Schematic
}

for (WrappedItemStack wrappedItemStack : blockList) {
if (player.capabilities.isCreativeMode) wrappedItemStack.inventory = -1;
else wrappedItemStack.inventory = EntityHelper.getItemCountInInventory(
player.inventory,
wrappedItemStack.itemStack.getItem(),
wrappedItemStack.itemStack.getItemDamage());
if (player.capabilities.isCreativeMode) {
wrappedItemStack.inventory = -1;
} else if (wrappedItemStack.isACShape) {
wrappedItemStack.inventory = ArchitectureCraftHelper
.countShapeInInventory(player.inventory, wrappedItemStack.itemStack);
} else {
wrappedItemStack.inventory = EntityHelper.getItemCountInInventory(
player.inventory,
wrappedItemStack.itemStack.getItem(),
wrappedItemStack.itemStack.getItemDamage());
}
}

return blockList;
}

private WrappedItemStack findOrCreateWrappedItemStackFor(final List<WrappedItemStack> blockList,
final ItemStack itemStack) {
final ItemStack itemStack, final boolean isACShape) {
for (final WrappedItemStack wrappedItemStack : blockList) {
if (wrappedItemStack.itemStack.isItemEqual(itemStack)) {
if (isACShape
&& !ArchitectureCraftHelper.areShapeItemStacksEqual(wrappedItemStack.itemStack, itemStack)) {
continue;
}
return wrappedItemStack;
}
}

final WrappedItemStack wrappedItemStack = new WrappedItemStack(itemStack.copy());
final WrappedItemStack wrappedItemStack = new WrappedItemStack(itemStack.copy(), isACShape);
blockList.add(wrappedItemStack);
return wrappedItemStack;
}
Expand All @@ -98,9 +113,15 @@ public static class WrappedItemStack {
public int placed;
public int total;
public int inventory;
public boolean isACShape;

public WrappedItemStack(final ItemStack itemStack) {
this(itemStack, false);
}

public WrappedItemStack(final ItemStack itemStack, final boolean isACShape) {
this(itemStack, 0, 0);
this.isACShape = isACShape;
}

public WrappedItemStack(final ItemStack itemStack, final int placed, final int total) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.github.lunatrius.core.util.vector.Vector3f;
import com.github.lunatrius.core.util.vector.Vector3i;
import com.github.lunatrius.schematica.api.ISchematic;
import com.github.lunatrius.schematica.compat.architecturecraft.ArchitectureCraftHelper;
import com.github.lunatrius.schematica.handler.ConfigurationHandler;
import com.github.lunatrius.schematica.reference.Reference;
import com.github.lunatrius.schematica.world.chunk.ChunkProviderSchematic;
Expand Down Expand Up @@ -252,6 +253,12 @@ public void flip(ForgeDirection direction) {
tileEntity.xCoord = width - 1 - tileEntity.xCoord;
tileEntity.blockMetadata = schematicFlipped
.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicFlipped.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationFlip(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}
Comment on lines +256 to +261

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these AC code blocks look identical, can we pull them out into a single method?

schematicFlipped.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}
flipStateX++;
Expand All @@ -274,6 +281,12 @@ public void flip(ForgeDirection direction) {
tileEntity.zCoord = length - 1 - tileEntity.zCoord;
tileEntity.blockMetadata = schematicFlipped
.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicFlipped.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationFlip(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}
schematicFlipped.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}
flipStateZ++;
Expand All @@ -297,6 +310,12 @@ public void flip(ForgeDirection direction) {
tileEntity.yCoord = height - 1 - tileEntity.yCoord;
tileEntity.blockMetadata = schematicFlipped
.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicFlipped.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationFlip(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}
schematicFlipped.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}
flipStateY++;
Expand Down Expand Up @@ -346,6 +365,12 @@ public void rotate(ForgeDirection direction) {
tileEntity.zCoord = height - 1 - coord;
tileEntity.blockMetadata = schematicRotated
.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicRotated.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationRotate(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}
schematicRotated.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}

Expand Down Expand Up @@ -389,6 +414,13 @@ public void rotate(ForgeDirection direction) {
skullTileEntity.func_145903_a((skullTileEntity.func_145906_b() + 12) & 15);
}

if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicRotated.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationRotate(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}

schematicRotated.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}

Expand Down Expand Up @@ -426,6 +458,12 @@ public void rotate(ForgeDirection direction) {
tileEntity.yCoord = width - 1 - coord;
tileEntity.blockMetadata = schematicRotated
.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
if (ArchitectureCraftHelper.isLoaded() && ArchitectureCraftHelper.isShapeBlock(
schematicRotated.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord))) {
byte[] ori = ArchitectureCraftHelper.getOrientationFromTE(tileEntity);
byte[] newOri = ArchitectureCraftHelper.transformOrientationRotate(ori[0], ori[1], direction);
ArchitectureCraftHelper.setOrientationOnTE(tileEntity, newOri[0], newOri[1]);
}
schematicRotated.setTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.github.lunatrius.schematica.compat.architecturecraft;

import gcewing.architecture.ArchitectureCraft;
import gcewing.architecture.common.network.ChannelOutput;

/**
* Isolates direct ArchitectureCraft class references. Do not use without checking if ArchitectureCraft is loaded.
*/
class ArchitectureCraftBridge {

static void sendOrientationUpdate(int x, int y, int z, byte side, byte turn) {
ChannelOutput out = ArchitectureCraft.channel.openServer("SetOrientation");
out.writeInt(x);
out.writeInt(y);
out.writeInt(z);
out.writeByte(side);
out.writeByte(turn);
out.close();
}
}
Loading