mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Rename Orientation to ForgeDirection {Damn MCP naming a class Direction already}
This commit is contained in:
1 parent
035328496c
commit
fc430243d1
17 files changed
+56
-56
No files matched your search
@@ -5,9 +5,9 @@
|
||||
|
||||
import java.util.Random;
|
||||
+
|
||||
+import net.minecraftforge.common.Orientation;
|
||||
+import net.minecraftforge.common.ForgeDirection;
|
||||
+
|
||||
+import static net.minecraftforge.common.Orientation.*;
|
||||
+import static net.minecraftforge.common.ForgeDirection.*;
|
||||
|
||||
public class BlockButton extends Block
|
||||
{
|
||||
@@ -16,7 +16,7 @@
|
||||
public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
- return par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4)));
|
||||
+ Orientation dir = Orientation.getOrientation(par5);
|
||||
+ ForgeDirection dir = ForgeDirection.getOrientation(par5);
|
||||
+ return (dir == NORTH && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH)) ||
|
||||
+ (dir == SOUTH && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH)) ||
|
||||
+ (dir == WEST && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST)) ||
|
||||
@@ -43,7 +43,7 @@
|
||||
-
|
||||
- if (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1))
|
||||
+
|
||||
+ Orientation dir = Orientation.getOrientation(par5);
|
||||
+ ForgeDirection dir = ForgeDirection.getOrientation(par5);
|
||||
+
|
||||
+ if (dir == NORTH && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user