mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Some things to note: Netty is screwy so currently can't join single player. @cpw Crafting has been MAJORY reworked. The current GameRegistry functions are nooped, this is IN THE WORKS. Just need to move the recipe list to a full class registry, and then re implement the in-code recipe registration. Also, it IS advised that modders move to JSON, because ideally we'll see a S->C recipe syncing system in 1.13 which would allow servers to have custom recipes. OreDictionary currently 1/2 works, need to write a better algorithm for replacing ingredients. Please be patient Rendering: A lot of functions got a new float parameter, this is similar to partial ticks, needs more research
53 lines
2.9 KiB
Diff
53 lines
2.9 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockFence.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFence.java
|
|
@@ -165,7 +165,10 @@
|
|
|
|
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
|
{
|
|
- return p_176221_1_.func_177226_a(field_176526_a, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH))).func_177226_a(field_176525_b, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177974_f(), EnumFacing.WEST))).func_177226_a(field_176527_M, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH))).func_177226_a(field_176528_N, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177976_e(), EnumFacing.EAST)));
|
|
+ return p_176221_1_.func_177226_a(field_176526_a, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
|
|
+ .func_177226_a(field_176525_b, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST))
|
|
+ .func_177226_a(field_176527_M, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
|
|
+ .func_177226_a(field_176528_N, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST));
|
|
}
|
|
|
|
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
|
|
@@ -201,6 +204,37 @@
|
|
return new BlockStateContainer(this, new IProperty[] {field_176526_a, field_176525_b, field_176528_N, field_176527_M});
|
|
}
|
|
|
|
+ /* ======================================== FORGE START ======================================== */
|
|
+
|
|
+ @Override
|
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
|
+ {
|
|
+ Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
|
+
|
|
+ if(connector instanceof BlockFence)
|
|
+ {
|
|
+ if(this != Blocks.field_150386_bk && connector == Blocks.field_150386_bk)
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+ else if(this == Blocks.field_150386_bk && connector != Blocks.field_150386_bk)
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ private boolean canFenceConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
|
+ {
|
|
+ BlockPos other = pos.func_177972_a(facing);
|
|
+ Block block = world.func_180495_p(other).func_177230_c();
|
|
+ return block.canBeConnectedTo(world, other, facing.func_176734_d()) || func_176524_e(world, other, facing.func_176734_d());
|
|
+ }
|
|
+
|
|
+ /* ======================================== FORGE END ======================================== */
|
|
+
|
|
public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
|
|
{
|
|
return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE : BlockFaceShape.CENTER;
|