Skip to content

Commit c6bbab0

Browse files
committed
Merge remote-tracking branch 'DangerousMilk/block-bounds-fix' into dev
2 parents 2905b7d + 9c2de46 commit c6bbab0

2 files changed

Lines changed: 29 additions & 0 deletions

File tree

gradlew

100644100755
File mode changed.

src/main/java/modernmarkings/blocks/MarkingWall.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.entity.player.EntityPlayer;
77
import net.minecraft.util.AxisAlignedBB;
88
import net.minecraft.util.MathHelper;
9+
import net.minecraft.world.IBlockAccess;
910
import net.minecraft.world.World;
1011
import net.minecraftforge.common.util.ForgeDirection;
1112

@@ -109,6 +110,34 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y
109110
return AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0);
110111
}
111112

113+
public void setBlockBoundsBasedOnState(IBlockAccess worldIn, int x, int y, int z) {
114+
int meta = worldIn.getBlockMetadata(x, y, z);
115+
116+
float minY = 0;
117+
float maxY = 1.0F;
118+
float minX = 0.0F;
119+
float maxX = 1.0F;
120+
float thickness = 0.01F;
121+
122+
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
123+
124+
// From BlockSign
125+
switch (meta) {
126+
case 2:
127+
this.setBlockBounds(minX, minY, 1.0F - thickness, maxX, maxY, 1.0F);
128+
break;
129+
case 3:
130+
this.setBlockBounds(minX, minY, 0.0F, maxX, maxY, thickness);
131+
break;
132+
case 4:
133+
this.setBlockBounds(1.0F - thickness, minY, minX, 1.0F, maxY, maxX);
134+
break;
135+
case 5:
136+
this.setBlockBounds(0.0F, minY, minX, thickness, maxY, maxX);
137+
break;
138+
}
139+
}
140+
112141
@Override
113142
public boolean renderAsNormalBlock() {
114143
return false;

0 commit comments

Comments
 (0)