Skip to content

Commit 99adff4

Browse files
committed
Fixed #126: Adjust bounding box of chutes according to display, Fixed
#125: Chutes not solid, removed some debug output
1 parent a1c59b2 commit 99adff4

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

common/net/teamio/taam/content/common/BlockMachines.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.tileentity.TileEntity;
1313
import net.minecraft.world.IBlockAccess;
1414
import net.minecraft.world.World;
15+
import net.minecraftforge.common.util.ForgeDirection;
1516
import net.teamio.taam.Taam;
1617
import net.teamio.taam.Taam.BLOCK_MACHINES_META;
1718
import net.teamio.taam.content.BaseBlock;
@@ -71,13 +72,14 @@ public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
7172
int metadata = world.getBlockMetadata(x, y, z);
7273
switch(metadata) {
7374
case 0:
74-
this.minX = 0.10;
75+
// Have chute as full model for now..
76+
/*this.minX = 0.10;
7577
this.minY = 0;
7678
this.minZ = 0.10;
7779
this.maxX = 0.9;
7880
this.maxY = 1;
7981
this.maxZ = 0.9;
80-
break;
82+
break;*/
8183
case 1:
8284
this.minX = 0;
8385
this.minY = 0;
@@ -98,5 +100,16 @@ public void breakBlock(World world, int x, int y, int z, Block block,
98100
}
99101
super.breakBlock(world, x, y, z, block, meta);
100102
}
103+
104+
@Override
105+
public boolean isSideSolid(IBlockAccess world, int x, int y, int z,
106+
ForgeDirection side) {
107+
int meta = world.getBlockMetadata(x, y, z);
108+
if(meta == 0) {
109+
return side == ForgeDirection.DOWN || side == ForgeDirection.UP;
110+
} else {
111+
return true;
112+
}
113+
}
101114

102115
}

common/net/teamio/taam/content/conveyors/BlockProductionLine.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ public static boolean checkSupport(World world, int x, int y, int z, ForgeDirect
217217
case SOUTH:
218218
case WEST:
219219
case DOWN:
220-
System.out.println("Side directly");
221220
// Attach to the side of or above a conveyor
222221
return true;
223222
}
@@ -233,7 +232,6 @@ public static boolean checkSupport(World world, int x, int y, int z, ForgeDirect
233232
}
234233
if(checkFurther && supportCount > 0) {
235234
if(checkDirectSupport(world, x + side.offsetX, y + side.offsetY, z + side.offsetZ)) {
236-
System.out.println("Direct support");
237235
return true;
238236
} else {
239237
if(checkSupport(world, x + side.offsetX, y + side.offsetY, z + side.offsetZ, side, myDir, supportCount - 1, conveyorOnly)) {

0 commit comments

Comments
 (0)