Merge branch '1.11' into 1.12

* 1.11:
  Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay
  move zh_cn lang file back to thr correct place
  Update entity names
  Another cleanup
  Fix dev environment after adding SD compat
  Kill off some unused code
  Updated minor compat

Conflicts:
	build.gradle
This commit is contained in:
aidancbrady committed 2017-07-31 18:40:01 -07:00
commit 8ed83b0e4f
28 files changed
+92 -290

No files matched your search

@@ -80,50 +80,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
}
}
@Override
public EnumSet<EnumFacing> getOutputtingSides()
public boolean sideIsOutput(EnumFacing side)
{
if(structure != null && mode)
{
EnumSet<EnumFacing> set = EnumSet.allOf(EnumFacing.class);
for(EnumFacing side : EnumFacing.VALUES)
{
if(structure.locations.contains(Coord4D.get(this).offset(side)))
{
set.remove(side);
}
}
return set;
}
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsOutput(EnumFacing side) {
if (structure != null && mode)
{
return !structure.locations.contains(Coord4D.get(this).offset(side));
}
return false;
}
@Override
public EnumSet<EnumFacing> getConsumingSides()
public boolean sideIsConsumer(EnumFacing side)
{
if(structure != null && !mode)
{
return EnumSet.allOf(EnumFacing.class);
}
return EnumSet.noneOf(EnumFacing.class);
}
@Override
public boolean sideIsConsumer(EnumFacing side) {
return (structure != null && !mode);
}